stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-20 09:11:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change PlayerBot so that it accepts a player number

Browse source 
Make PlayerExiting consistent with PlayerFinished
This commit is contained in:
Lactozilla 2024-04-30 00:35:17 -03:00
parent dc4871829b
commit 263e0577ad
3 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extras/acs/srb2defs.acs
View file

@ -212,6 +212,16 @@
#define SHIELD_FORCEHP 0xFF
// Emeralds
#define EMERALD1 (1 << 0)
#define EMERALD2 (1 << 1)
#define EMERALD3 (1 << 2)
#define EMERALD4 (1 << 3)
#define EMERALD5 (1 << 4)
#define EMERALD6 (1 << 5)
#define EMERALD7 (1 << 6)
// Teams
#define NO_TEAM 0

4
extras/acs/srb2special.acs
View file

@ -33,8 +33,8 @@ special
-303:SkinUnlocked(1),
-304:PlayerSkin(0),
-305:PlayerEmeralds(0),
-306:PlayerBot(0),
-307:PlayerExiting(0),
-306:PlayerBot(1),
-307:PlayerExiting(1),
-308:PlayerLap(0),
-309:RingSlingerMode(0),
-310:TeamGame(0),

50
src/acs/call-funcs.cpp
View file

@ -1686,24 +1686,28 @@ bool CallFunc_PlayerSkin(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::
/*--------------------------------------------------
bool CallFunc_PlayerBot(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
Returns the activating player's bot status.
Returns the given player's bot status.
--------------------------------------------------*/
bool CallFunc_PlayerBot(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
{
auto info = &static_cast<Thread *>(thread)->info;
(void)argV;
(void)argC;
if ((info != NULL)
&& (info->mo != NULL && P_MobjWasRemoved(info->mo) == false)
&& (info->mo->player != NULL))
INT32 playernum = argV[0];
bool isBot = false;
if (playernum < 0 || playernum >= MAXPLAYERS)
{
thread->dataStk.push(info->mo->player->bot);
return false;
CONS_Alert(CONS_WARNING, "PlayerBot player %d out of range (expected 0 - %d).\n", playernum, MAXPLAYERS-1);
}
else
{
if (players[playernum].bot != BOT_NONE)
isBot = true;
}
thread->dataStk.push(false);
thread->dataStk.push(isBot);
return false;
}
@ -1714,20 +1718,24 @@ bool CallFunc_PlayerBot(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::W
--------------------------------------------------*/
bool CallFunc_PlayerExiting(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
{
auto info = &static_cast<Thread *>(thread)->info;
(void)argV;
(void)argC;
if ((info != NULL)
&& (info->mo != NULL && P_MobjWasRemoved(info->mo) == false)
&& (info->mo->player != NULL))
INT32 playernum = argV[0];
bool exiting = false;
if (playernum < 0 || playernum >= MAXPLAYERS)
{
thread->dataStk.push((info->mo->player->exiting != 0));
return false;
CONS_Alert(CONS_WARNING, "PlayerExiting player %d out of range (expected 0 - %d).\n", playernum, MAXPLAYERS-1);
}
else
{
if (players[playernum].exiting != 0)
exiting = true;
}
thread->dataStk.push(false);
thread->dataStk.push(exiting);
return false;
}
@ -5255,7 +5263,7 @@ bool CallFunc_PlayerIsIt(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::
/*--------------------------------------------------
bool CallFunc_PlayerFinished(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
Checks if the activator finished the level.
Checks if the given player finished the level.
--------------------------------------------------*/
bool CallFunc_PlayerFinished(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
{
@ -5283,7 +5291,7 @@ bool CallFunc_PlayerFinished(ACSVM::Thread *thread, const ACSVM::Word *argV, ACS
/*--------------------------------------------------
bool CallFunc_SpawnProjectile(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
Spawns a projectile. Yeah...
Spawns a projectile.
--------------------------------------------------*/
bool CallFunc_SpawnProjectile(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
{