From d5e3be61c2e54da1782d7d9067e52fea3fd2b393 Mon Sep 17 00:00:00 2001
From: nukeykt <alexeytf2@gmail.com>
Date: Fri, 7 Feb 2020 22:53:33 +0900
Subject: [PATCH] Rednukem: WW2GI fixes

# Conflicts:
#	source/rr/src/menus.cpp
---
 source/rr/src/actors.cpp | 4 ++--
 source/rr/src/cheats.cpp | 2 +-
 source/rr/src/game.cpp   | 2 +-
 source/rr/src/player.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/rr/src/actors.cpp b/source/rr/src/actors.cpp
index 3c56ce9b5..e9ad1787c 100644
--- a/source/rr/src/actors.cpp
+++ b/source/rr/src/actors.cpp
@@ -5805,11 +5805,11 @@ ACTOR_STATIC void G_MoveActors(void)
             }
 
 DETONATEB:
-            if (!NAM)
+            if (!NAM_WW2GI)
                 bBoom = 0;
             if ((detonatePlayer >= 0 && g_player[detonatePlayer].ps->hbomb_on == 0) || pData[3] == 1)
                 bBoom = 1;
-            if (NAM && pSprite->picnum == HEAVYHBOMB)
+            if (NAM_WW2GI && pSprite->picnum == HEAVYHBOMB)
             {
                 pSprite->extra--;
                 if (pSprite->extra <= 0)
diff --git a/source/rr/src/cheats.cpp b/source/rr/src/cheats.cpp
index ecfd7e020..922eb4bd5 100644
--- a/source/rr/src/cheats.cpp
+++ b/source/rr/src/cheats.cpp
@@ -696,7 +696,7 @@ void G_DoCheats(void)
                     return;
 
                 case CHEAT_TODD:
-                    if (NAM)
+                    if (NAM_WW2GI)
                     {
                         quoteMgr.InitializeQuote(QUOTE_RESERVED4, g_NAMMattCheatQuote);
                         P_DoQuote(QUOTE_RESERVED4, pPlayer);
diff --git a/source/rr/src/game.cpp b/source/rr/src/game.cpp
index 86101a663..d3ef1d0a1 100644
--- a/source/rr/src/game.cpp
+++ b/source/rr/src/game.cpp
@@ -2614,7 +2614,7 @@ rrbloodpool_fallthrough:
                 pSprite->y     = sprite[spriteNum].y + (sintable[shellAng & 2047] >> 7);
                 pSprite->shade = -8;
 
-                if (NAM)
+                if (NAM_WW2GI)
                 {
                     pSprite->ang  = shellAng + 512;
                     pSprite->xvel = 30;
diff --git a/source/rr/src/player.cpp b/source/rr/src/player.cpp
index 7ea3b35ac..2fdc91a8d 100644
--- a/source/rr/src/player.cpp
+++ b/source/rr/src/player.cpp
@@ -1345,7 +1345,7 @@ growspark_rr:
 
             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;
             }
             else if (pSprite->statnum != STAT_EFFECTOR)