From 00fc79978bf84ab9cc88fda7c7ec4ea00cdb5b7b Mon Sep 17 00:00:00 2001
From: Mikko Tiusanen <ams@daug.net>
Date: Tue, 3 Jun 2014 00:31:29 +0300
Subject: Cleaned up some of the code related to previous changes. Commented
 out increment line that caused cvar change messages on building death.

---
 src/game/bg_misc.c  | 2 +-
 src/game/g_combat.c | 2 +-
 src/game/g_main.c   | 3 +--
 src/game/g_weapon.c | 6 +++---
 4 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 89d2335..0b9ff85 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -3217,7 +3217,7 @@ static const weaponAttributes_t bg_weapons[ ] =
     qfalse,               //int       usesEnergy;
     LEVEL2_CLAW_U_REPEAT, //int       repeatRate1;
     LEVEL2_AREAZAP_REPEAT,//int       repeatRate2;
-    0, //LEVEL2_BOUNCEBALL_REPEAT,//int    repeatRate3;
+    LEVEL2_BOUNCEBALL_REPEAT,//int    repeatRate3;
     0,                    //int       reloadTime;
     LEVEL2_CLAW_U_K_SCALE,//float     knockbackScale;
     qtrue,                //qboolean  hasAltMode;
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 70803af..51b7005 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -401,7 +401,7 @@ float G_RewardAttackers( gentity_t *self )
     }
     self->credits[ i ] = 0;
   }
-  ++self->client->pers.deaths;
+  // ++self->client->pers.deaths;
 
   // Com_Printf(S_COLOR_YELLOW "Killed: kills = %f deaths = %d\n",self->client->pers.kills,self->client->pers.deaths);
   // Com_Printf(S_COLOR_YELLOW "Team: kills = %f deaths = %f\n",level.alienRewardKills,level.humanRewardKills);
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 53f36ce..755aee1 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -263,7 +263,6 @@ static cvarTable_t   gameCvarTable[ ] =
   { &g_humanRefineryRadius, "g_humanRefineryRadius", REFINERY_RADIUS, CVAR_ARCHIVE, 0, qfalse  }, 
   { &g_humanStage, "g_humanStage", "0", 0, 0, qfalse  },
   { &g_humanCredits, "g_humanCredits", "0", 0, 0, qfalse  },
-  { &g_humanStage, "g_humanStage", "0", 0, 0, qfalse  },
   { &g_humanMaxStage, "g_humanMaxStage", DEFAULT_HUMAN_MAX_STAGE, 0, 0, qfalse, cv_humanMaxStage },
   { &g_humanStage2Threshold, "g_humanStage2Threshold", DEFAULT_HUMAN_STAGE2_THRESH, 0, 0, qfalse  },
   { &g_humanStage3Threshold, "g_humanStage3Threshold", DEFAULT_HUMAN_STAGE3_THRESH, 0, 0, qfalse  },
@@ -340,7 +339,7 @@ static cvarTable_t   gameCvarTable[ ] =
   { &g_KillRewardMultiplierH, "g_KillRewardMultiplierH", "1", CVAR_ARCHIVE, 0, qfalse },
   { &g_ConstantRewardFactor, "g_ConstantRewardFactor", "0.25", CVAR_ARCHIVE, 0, qfalse },
   { &g_TeamRewardFactor, "g_TeamRewardFactor", "0.5", CVAR_ARCHIVE, 0, qfalse },
-  { &g_PlayerRewardFactor, "g_PlayerRewardFactor", "0.25", CVAR_ARCHIVE, 0, qfalse }
+  { &g_PlayerRewardFactor, "g_PlayerRewardFactor", "0.25", CVAR_ARCHIVE, 0, qfalse },
 };
 static int gameCvarTableSize = sizeof( gameCvarTable ) / sizeof( gameCvarTable[ 0 ] );
 void G_InitGame( int levelTime, int randomSeed, int restart );
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 115c451..2ea5e85 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -1731,9 +1731,9 @@ gclient_t *client;
       slowBlobFire( ent );
       break;
 
-   //case WP_ALEVEL2_UPG:
-   //   bounceBallFire_level2( ent );
-   //   break;
+   case WP_ALEVEL2_UPG:
+      bounceBallFire_level2( ent );
+      break;
 
   case WP_ALEVEL5:
       Prickles( ent );
-- 
cgit