[Change] Added more Lua parameter checking.

This commit is contained in:
Allanis 2013-08-01 16:30:30 +01:00
parent 5109958e29
commit 0480a2a74e

View File

@ -614,9 +614,9 @@ static int player_addCargo(lua_State* L) {
LLUA_MIN_ARGS(2); LLUA_MIN_ARGS(2);
if(lua_isstring(L, 2)) cargo = commodity_get((char*) lua_tostring(L, 1)); if(lua_isstring(L, 2)) cargo = commodity_get((char*) lua_tostring(L, 1));
else return 0; else LLUA_INVALID_PARAMETER();
if(lua_isnumber(L, 2)) quantity = (int)lua_tonumber(L, 2); if(lua_isnumber(L, 2)) quantity = (int)lua_tonumber(L, 2);
else return 0; else LLUA_INVALID_PARAMETER();
ret = pilot_addMissionCargo(player, cargo, quantity); ret = pilot_addMissionCargo(player, cargo, quantity);
mission_linkCargo(cur_mission, ret); mission_linkCargo(cur_mission, ret);
@ -632,7 +632,7 @@ static int player_rmCargo(lua_State* L) {
LLUA_MIN_ARGS(1); LLUA_MIN_ARGS(1);
if(lua_isnumber(L, 1)) id = (unsigned int) lua_tonumber(L, 1); if(lua_isnumber(L, 1)) id = (unsigned int) lua_tonumber(L, 1);
else return 0; else LLUA_INVALID_PARAMETER();
ret = pilot_rmMissionCargo(player, id); ret = pilot_rmMissionCargo(player, id);
mission_unlinkCargo(cur_mission, id); mission_unlinkCargo(cur_mission, id);
@ -647,7 +647,7 @@ static int player_pay(lua_State* L) {
LLUA_MIN_ARGS(1); LLUA_MIN_ARGS(1);
if(lua_isnumber(L, 1)) money = (int) lua_tonumber(L, 1); if(lua_isnumber(L, 1)) money = (int) lua_tonumber(L, 1);
else return 0; else LLUA_INVALID_PARAMETER();
player->credits += money; player->credits += money;
@ -659,7 +659,7 @@ static int player_msg(lua_State* L) {
char* str; char* str;
if(lua_isstring(L, -1)) str = (char*) lua_tostring(L, -1); if(lua_isstring(L, -1)) str = (char*) lua_tostring(L, -1);
else return 0; else LLUA_INVALID_PARAMETER();
player_message(str); player_message(str);
return 0; return 0;