zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: CON_ADDKILLS in RedNukem code was performing RR-only checks even when playing Duke. 

Original code looks like this:

case 88:
	insptr++;
	ps[g_p].actors_killed += *insptr;
	hittype[g_i].actorstayput = -1;
	insptr++;
	break;
This commit is contained in:
Christoph Oelckers 2020-02-12 22:48:28 +01:00
parent 1c24ae3fad
commit 1e8e5d3732
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/rr/src/gameexec.cpp
View File

@ -1830,9 +1830,14 @@ GAMEEXEC_STATIC void VM_Execute(native_t loop)
case CON_ADDKILLS:
insptr++;
if ((g_spriteExtra[vm.spriteNum] < 1 || g_spriteExtra[vm.spriteNum] == 128)
&& A_CheckSpriteFlags(vm.spriteNum, SFLAG_KILLCOUNT))
P_AddKills(pPlayer, *insptr);
if (g_gameType & GAMEFLAG_RR)
{
// This check does not exist in Duke Nukem.
if ((g_spriteExtra[vm.spriteNum] < 1 || g_spriteExtra[vm.spriteNum] == 128)
&& A_CheckSpriteFlags(vm.spriteNum, SFLAG_KILLCOUNT))
P_AddKills(pPlayer, *insptr);
}
else P_AddKills(pPlayer, *insptr);
insptr++;
vm.pActor->actorstayput = -1;
continue;