stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 12:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'checkbotname' into 'next'

Browse source 
Fix #732

Closes #732

See merge request STJr/SRB2!1739
This commit is contained in:
sphere 2022-02-17 12:26:22 +00:00
commit a8c2c4ebe6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lua_baselib.c
View file

@ -3455,7 +3455,7 @@ static int lib_gAddPlayer(lua_State *L)
lua_pushnil(L);
return 1;
}
newplayernum = i;
@ -3486,15 +3486,15 @@ static int lib_gAddPlayer(lua_State *L)
// Read the bot name, if given
if (!lua_isnoneornil(L, 3))
strcpy(player_names[newplayernum], luaL_checkstring(L, 3));
strlcpy(player_names[newplayernum], luaL_checkstring(L, 3), sizeof(*player_names));
bot = luaL_optinteger(L, 4, 3);
newplayer->bot = (bot >= BOT_NONE && bot <= BOT_MPAI) ? bot : BOT_MPAI;
// If our bot is a 2P type, we'll need to set its leader so it can spawn
if (newplayer->bot == BOT_2PAI || newplayer->bot == BOT_2PHUMAN)
B_UpdateBotleader(newplayer);
// Set the skin (can't do this until AFTER bot type is set!)
SetPlayerSkinByNum(newplayernum, skinnum);
@ -3507,7 +3507,7 @@ static int lib_gAddPlayer(lua_State *L)
strcpy(joinmsg, va(joinmsg, player_names[newplayernum], newplayernum));
HU_AddChatText(joinmsg, false);
}
LUA_PushUserdata(L, newplayer, META_PLAYER);
return 1;
}