CON: Fix playervar quick structure access.

git-svn-id: https://svn.eduke32.com/eduke32@6404 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-07-29 20:40:00 +00:00
parent d414d15b52
commit 8c5fe26b14

View file

@ -754,10 +754,12 @@ special:
returnValue = VM_GetPlayerInput(arrayIndex, labelNum);
break;
case STRUCT_ACTORVAR:
case STRUCT_PLAYERVAR:
// no THISACTOR check here because we convert those cases to setvarvar
returnValue = Gv_GetVar(labelNum, arrayIndex, playerNum);
case STRUCT_ACTORVAR:
returnValue = Gv_GetVar(labelNum, arrayIndex, vm.playerNum);
break;
case STRUCT_PLAYERVAR:
returnValue = Gv_GetVar(labelNum, vm.spriteNum, arrayIndex);
break;
case STRUCT_SECTOR:
@ -950,11 +952,13 @@ int __fastcall Gv_GetSpecialVarX(int gameVar)
returnValue = VM_GetPlayerInput(arrayIndex, labelNum);
break;
case STRUCT_ACTORVAR:
case STRUCT_PLAYERVAR:
// no THISACTOR check here because we convert those cases to setvarvar
case STRUCT_ACTORVAR:
returnValue = Gv_GetVar(labelNum, arrayIndex, vm.playerNum);
break;
case STRUCT_PLAYERVAR:
returnValue = Gv_GetVar(labelNum, vm.spriteNum, arrayIndex);
break;
case STRUCT_SECTOR:
if (arrayIndexVar == g_thisActorVarID)