teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 15:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check constants before THISACTOR in Gv_GetManyVars(). Seems much more likely to be true.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6346 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-07-08 19:42:01 +00:00
parent 8be8ae8743
commit 4c981137be
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/duke3d/src/gamevars.cpp
View file

@ -1002,21 +1002,21 @@ void __fastcall Gv_GetManyVars(int const numVars, int32_t * const outBuf)
{
int gameVar = *insptr++;
if (gameVar == g_thisActorVarID)
{
outBuf[j] = vm.spriteNum;
continue;
}
if (gameVar == MAXGAMEVARS)
{
outBuf[j] = *insptr++;
continue;
}
if (gameVar == g_thisActorVarID)
{
outBuf[j] = vm.spriteNum;
continue;
}
int const invertResult = !!(gameVar & (MAXGAMEVARS << 1));
if (gameVar >= g_gameVarCount && invertResult == 0)
if (gameVar >= g_gameVarCount && !invertResult)
{
outBuf[j] = Gv_GetSpecialVarX(gameVar);
continue;
@ -1039,9 +1039,9 @@ void __fastcall Gv_GetManyVars(int const numVars, int32_t * const outBuf)
{
switch (varFlags)
{
case GAMEVAR_INTPTR: value = (*((int32_t *)aGameVars[gameVar].global)); break;
case GAMEVAR_INTPTR: value = (*((int32_t *)aGameVars[gameVar].global)); break;
case GAMEVAR_SHORTPTR: value = (*((int16_t *)aGameVars[gameVar].global)); break;
case GAMEVAR_CHARPTR: value = (*((uint8_t *)aGameVars[gameVar].global)); break;
case GAMEVAR_CHARPTR: value = (*((uint8_t *)aGameVars[gameVar].global)); break;
}
}