From aba749c3bd992c4bd95fea966459d56fa4b6b39e Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 2 May 2018 07:12:52 +0000
Subject: [PATCH] WWII GI: Update the default values of the weapon gamevars to
 correctly match the original game.

git-svn-id: https://svn.eduke32.com/eduke32@6868 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/gamevars.cpp | 42 +++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/source/duke3d/src/gamevars.cpp b/source/duke3d/src/gamevars.cpp
index cb1933d38..0f103e1f9 100644
--- a/source/duke3d/src/gamevars.cpp
+++ b/source/duke3d/src/gamevars.cpp
@@ -1429,9 +1429,45 @@ static void Gv_AddSystemVars(void)
         weapondefaults[SHRINKER_WEAPON].TotalTime = 30;
 
         weapondefaults[GROW_WEAPON].TotalTime = 30;
-        weapondefaults[GROW_WEAPON].SpawnTime = 2;
-        weapondefaults[GROW_WEAPON].Spawn = SHELL;
-        weapondefaults[GROW_WEAPON].FireSound = 0;
+
+        if (NAM)
+        {
+            weapondefaults[GROW_WEAPON].SpawnTime = 2;
+            weapondefaults[GROW_WEAPON].Spawn = SHELL;
+            weapondefaults[GROW_WEAPON].FireSound = 0;
+        }
+        else if (WW2GI)
+        {
+            weapondefaults[KNEE_WEAPON].Reload = 30;
+            weapondefaults[KNEE_WEAPON].HoldDelay = 14;
+
+            weapondefaults[PISTOL_WEAPON].Flags |= WEAPON_AUTOMATIC;
+
+            weapondefaults[SHOTGUN_WEAPON].TotalTime = 31;
+
+            weapondefaults[CHAINGUN_WEAPON].Reload = 30;
+            weapondefaults[CHAINGUN_WEAPON].FireDelay = 1;
+            weapondefaults[CHAINGUN_WEAPON].HoldDelay = 10;
+            weapondefaults[CHAINGUN_WEAPON].SpawnTime = 0;
+
+            weapondefaults[RPG_WEAPON].Reload = 30;
+
+            weapondefaults[DEVISTATOR_WEAPON].Reload = 30;
+            weapondefaults[DEVISTATOR_WEAPON].FireDelay = 2;
+            weapondefaults[DEVISTATOR_WEAPON].TotalTime = 5;
+            weapondefaults[DEVISTATOR_WEAPON].Flags = WEAPON_FIREEVERYOTHER;
+            weapondefaults[DEVISTATOR_WEAPON].ShotsPerBurst = 0;
+
+            weapondefaults[TRIPBOMB_WEAPON].Reload = 30;
+            weapondefaults[TRIPBOMB_WEAPON].HoldDelay = 0;
+            weapondefaults[TRIPBOMB_WEAPON].Flags = WEAPON_STANDSTILL;
+
+            weapondefaults[FREEZE_WEAPON].Flags = WEAPON_FIREEVERYOTHER;
+
+            weapondefaults[HANDREMOTE_WEAPON].Reload = 30;
+
+            weapondefaults[GROW_WEAPON].InitialSound = EXPANDERSHOOT;
+        }
     }
 
     for (int i=0; i<MAX_WEAPONS; i++)