zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-27 01:10:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON: Fix checkavailweapon command.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6408 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-07-30 21:23:51 +00:00
parent fe10e46778
commit bb13b0db85
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/duke3d/src/gameexec.cpp
View file

@ -4280,22 +4280,23 @@ finish_qsprintf:
case CON_CHECKAVAILWEAPON: case CON_CHECKAVAILWEAPON:
case CON_CHECKAVAILINVEN: case CON_CHECKAVAILINVEN:
insptr++;
tw = (*insptr != g_thisActorVarID) ? Gv_GetVarX(*insptr) : vm.playerNum;
insptr++;
if (EDUKE32_PREDICT_FALSE((unsigned)tw >= (unsigned)g_mostConcurrentPlayers))
{ {
CON_ERRPRINTF("invalid player %d\n", tw); insptr++;
size_t const playerNum = (*insptr++ != g_thisActorVarID) ? Gv_GetVarX(*insptr) : vm.playerNum;
if (EDUKE32_PREDICT_FALSE((unsigned)playerNum >= (unsigned)g_mostConcurrentPlayers))
{
CON_ERRPRINTF("invalid player %d\n", (int)playerNum);
continue; continue;
} }
if (tw == CON_CHECKAVAILWEAPON) if (tw == CON_CHECKAVAILWEAPON)
P_CheckWeapon(g_player[tw].ps); P_CheckWeapon(g_player[playerNum].ps);
else else
P_SelectNextInvItem(g_player[tw].ps); P_SelectNextInvItem(g_player[playerNum].ps);
continue; continue;
}
case CON_GETPLAYERANGLE: case CON_GETPLAYERANGLE:
insptr++; insptr++;