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

Update G_AddPlayer()

Browse source
This commit is contained in:
Shane Ellis 2021-01-23 10:13:16 -05:00
parent c391d76c11
commit 2abf89e800
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/lua_baselib.c
View file

@ -3432,8 +3432,7 @@ static int lib_gAddPlayer(lua_State *L)
newplayernum = i; newplayernum = i;
//if (!splitscreen && !botingame) CL_ClearPlayer(newplayernum);
CL_ClearPlayer(newplayernum);
playeringame[newplayernum] = true; playeringame[newplayernum] = true;
G_AddPlayer(newplayernum); G_AddPlayer(newplayernum);
@ -3442,30 +3441,34 @@ static int lib_gAddPlayer(lua_State *L)
newplayer->jointime = 0; newplayer->jointime = 0;
newplayer->quittime = 0; newplayer->quittime = 0;
// I hereby name you Bot X // Set the bot name (defaults to Bot #)
strcpy(player_names[newplayernum], va("Bot %d", botcount)); strcpy(player_names[newplayernum], va("Bot %d", botcount));
// Read the skin string! // Read the skin argument (defaults to Sonic)
if (!lua_isnoneornil(L, 1)) if (!lua_isnoneornil(L, 1))
{ {
skinnum = R_SkinAvailable(luaL_checkstring(L, 1)); skinnum = R_SkinAvailable(luaL_checkstring(L, 1));
skinnum = skinnum < 0 ? 0 : skinnum; skinnum = skinnum < 0 ? 0 : skinnum;
} }
// Read the color! // Read the color (defaults to skin prefcolor)
if (!lua_isnoneornil(L, 2)) if (!lua_isnoneornil(L, 2))
newplayer->skincolor = R_GetColorByName(luaL_checkstring(L, 2)); newplayer->skincolor = R_GetColorByName(luaL_checkstring(L, 2));
else else
newplayer->skincolor = skins[newplayer->skin].prefcolor; newplayer->skincolor = skins[newplayer->skin].prefcolor;
// Read the bot name, if given! // Read the bot name, if given
if (!lua_isnoneornil(L, 3)) if (!lua_isnoneornil(L, 3))
strcpy(player_names[newplayernum], luaL_checkstring(L, 3)); strcpy(player_names[newplayernum], luaL_checkstring(L, 3));
bot = luaL_optinteger(L, 4, 3); bot = luaL_optinteger(L, 4, 3);
newplayer->bot = (bot >= 0 && bot <= 3) ? bot : 3; newplayer->bot = (bot >= 0 && bot <= 3) ? bot : 3;
// Set the skin (needed to set bot first!) // 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); SetPlayerSkinByNum(newplayernum, skinnum);