OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- changed most places where a player index is calculated by subtracting the player array's base access.

Browse source
This commit is contained in:
Christoph Oelckers 2019-02-01 17:31:11 +01:00
commit 202f3d7d80
10 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/fragglescript/t_func.cpp
View file

@ -270,7 +270,7 @@ int FParser::T_GetPlayerNum(const svalue_t &arg)
//script_error("mobj not a player!\n");
return -1;
}
playernum = int(arg.value.mobj->player - players);
playernum = Level->PlayerNum(arg.value.mobj->player);
}
else
playernum = intvalue(arg);
@ -734,7 +734,7 @@ void FParser::SF_PlayerName(void)
{
player_t *pl=NULL;
if (Script->trigger) pl = Script->trigger->player;
if(pl) plnum = int(pl - players);
if(pl) plnum = Level->PlayerNum(pl);
else plnum=-1;
}
else
@ -765,7 +765,7 @@ void FParser::SF_PlayerObj(void)
{
player_t *pl=NULL;
if (Script->trigger) pl = Script->trigger->player;
if(pl) plnum = int(pl - players);
if(pl) plnum = Level->PlayerNum(pl);
else plnum=-1;
}
else
@ -805,7 +805,7 @@ void FParser::SF_Player(void)
if(mo && mo->player) // haleyjd: added mo->player
{
t_return.value.i = (int)(mo->player - players);
t_return.value.i = Level->PlayerNum(mo->player);
}
else
{