teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-22 11:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rednukem: WW2GI fixes

Browse source 
# Conflicts:
#	source/rr/src/menus.cpp
This commit is contained in:
nukeykt 2020-02-07 22:53:33 +09:00 committed by Christoph Oelckers
parent 365b7bfe79
commit d5e3be61c2
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/rr/src/actors.cpp
View file

@ -5805,11 +5805,11 @@ ACTOR_STATIC void G_MoveActors(void)
} }
DETONATEB: DETONATEB:
if (!NAM) if (!NAM_WW2GI)
bBoom = 0; bBoom = 0;
if ((detonatePlayer >= 0 && g_player[detonatePlayer].ps->hbomb_on == 0) || pData[3] == 1) if ((detonatePlayer >= 0 && g_player[detonatePlayer].ps->hbomb_on == 0) || pData[3] == 1)
bBoom = 1; bBoom = 1;
if (NAM && pSprite->picnum == HEAVYHBOMB) if (NAM_WW2GI && pSprite->picnum == HEAVYHBOMB)
{ {
pSprite->extra--; pSprite->extra--;
if (pSprite->extra <= 0) if (pSprite->extra <= 0)

2
source/rr/src/cheats.cpp
View file

@ -696,7 +696,7 @@ void G_DoCheats(void)
return; return;
case CHEAT_TODD: case CHEAT_TODD:
if (NAM) if (NAM_WW2GI)
{ {
quoteMgr.InitializeQuote(QUOTE_RESERVED4, g_NAMMattCheatQuote); quoteMgr.InitializeQuote(QUOTE_RESERVED4, g_NAMMattCheatQuote);
P_DoQuote(QUOTE_RESERVED4, pPlayer); P_DoQuote(QUOTE_RESERVED4, pPlayer);

2
source/rr/src/game.cpp
View file

@ -2614,7 +2614,7 @@ rrbloodpool_fallthrough:
pSprite->y = sprite[spriteNum].y + (sintable[shellAng & 2047] >> 7); pSprite->y = sprite[spriteNum].y + (sintable[shellAng & 2047] >> 7);
pSprite->shade = -8; pSprite->shade = -8;
if (NAM) if (NAM_WW2GI)
{ {
pSprite->ang = shellAng + 512; pSprite->ang = shellAng + 512;
pSprite->xvel = 30; pSprite->xvel = 30;

2
source/rr/src/player.cpp
View file

@ -1345,7 +1345,7 @@ growspark_rr:
if (playerNum >= 0) if (playerNum >= 0)
{ {
if (NAM || GetAutoAimAng(spriteNum, playerNum, projecTile, ZOFFSET6, 0, &startPos, 768, &Zvel, &shootAng) < 0) if (NAM_WW2GI || GetAutoAimAng(spriteNum, playerNum, projecTile, ZOFFSET6, 0, &startPos, 768, &Zvel, &shootAng) < 0)
Zvel = fix16_to_int(F16(100) - pPlayer->q16horiz - pPlayer->q16horizoff) * 98; Zvel = fix16_to_int(F16(100) - pPlayer->q16horiz - pPlayer->q16horizoff) * 98;
} }
else if (pSprite->statnum != STAT_EFFECTOR) else if (pSprite->statnum != STAT_EFFECTOR)