stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-23 03:12:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

G_RemovePlayer error handling

Browse source
This commit is contained in:
Shane Ellis 2021-07-12 23:38:52 -04:00
parent afa8466b30
commit 33ae95bf13
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lua_baselib.c
View file

@ -3482,15 +3482,16 @@ static int lib_gAddPlayer(lua_State *L)
static int lib_gRemovePlayer(lua_State *L)
{
UINT8 pnum = -1;
//const char *kickreason = luaL_checkstring(L, 2);
if (!lua_isnoneornil(L, 1))
pnum = luaL_checkinteger(L, 1);
if (&players[pnum])
else // No argument
return luaL_error(L, "argument #1 not given (expected number)");
if (pnum >= MAXPLAYERS) // Out of range
return luaL_error(L, "playernum %d out of range (0 - %d)", pnum, MAXPLAYERS-1);
if (playeringame[pnum]) // Found player
{
if (players[pnum].bot != BOT_NONE)
if (players[pnum].bot != BOT_NONE) // Can't remove clients.
{
// CL_RemovePlayer(pnum, *kickreason);
CL_RemovePlayer(pnum, pnum);
if (netgame)
{
@ -3503,9 +3504,11 @@ static int lib_gRemovePlayer(lua_State *L)
lua_pushboolean(L, true);
return 1;
}
else
return luaL_error(L, "G_RemovePlayer can only be used on players with a bot value other than BOT_NONE.");
}
lua_pushboolean(L, false);
return 1;
// Fell through. Invalid player
return LUA_ErrInvalid(L, "player_t");
}