Reverted cleanup, it borked up seriously.

src/game/bg_misc.c

@@ -5780,14 +5780,6 @@ void BG_MOD_set( modExtremeType_t entry, int value )
   }
 }
 
-int BG_MOD_get( modExtremeType_t entry)
-{
-  if( entry >= 0 && entry < MOD_BG_COUNT )
-    return modEntry[ entry ];
-
-  return 0;
-}
-
 void BG_MOD_update( void )
 {
   static qboolean updated = qfalse;
@@ -5809,13 +5801,6 @@ void BG_MOD_update( void )
       bg_buildableList[ i ].turretFireSpeed =
         bg_buildableList[ i ].turretFireSpeed * 100 / modEntry[ MOD_BG_BUILDABLE_SPEED ];
     }
-
-    if( modEntry[ MOD_BG_TURRET_ANGLE ] &&
-      ( bg_buildableList[ i ].buildNum == BA_H_MGTURRET ||
-        bg_buildableList[ i ].buildNum == BA_H_TESLAGEN ) )
-    {
-      bg_buildableList[ i ].minNormal = 0.0f;
-    }
   }
 
   for( i = 0; i < bg_numPclasses; i++ )

src/game/bg_pmove.c

@@ -714,15 +714,7 @@ static qboolean PM_CheckJump( void )
 
   //TA: take some stamina off
   if( pm->ps->stats[ STAT_PTEAM ] == PTE_HUMANS )
-  {
-    int rate;
-
-    rate = BG_MOD_get( MOD_BG_HUMAN_STAMINA );
-    if( rate )
-      pm->ps->stats[ STAT_STAMINA ] -= 500 * 100 / rate;
-    else
-      pm->ps->stats[ STAT_STAMINA ] -= 500;
-  }
+    pm->ps->stats[ STAT_STAMINA ] -= 500;
 
   pm->ps->groundEntityNum = ENTITYNUM_NONE;
 

src/game/bg_public.h

@@ -1344,11 +1344,9 @@ typedef enum
   MOD_BG_ALIEN_RATE,        // Alien fire rate
   MOD_BG_WEAPON_AMMO,       // Weapon ammo per clip
   MOD_BG_WEAPON_RELOAD,     // Weapon reload time
-  MOD_BG_TURRET_ANGLE,      // Allow high turret build angles
   MOD_BG_COUNT              // number of entries
 } modExtremeType_t;
 
 void BG_MOD_set( modExtremeType_t entry, int value );
-int  BG_MOD_get( modExtremeType_t entry);
 void BG_MOD_update( void );
 

src/game/g_active.c

@@ -199,9 +199,6 @@ static void G_ClientShove( gentity_t *ent, gentity_t *victim )
   // shoving enemies changes gameplay too much
   if( !OnSameTeam( ent, victim ) )
     return;
-    
-  if( victim->client->pers.healing && !g_healShove.integer )
-  return;
 
   if ( ( victim->client->ps.weapon >= WP_ABUILD ) &&
        ( victim->client->ps.weapon <= WP_HBUILD ) &&

src/game/g_admin.c

@@ -104,7 +104,7 @@ g_admin_cmd_t g_admin_cmds[ ] =
       "[^3name|slot#^7] [^3#^7]"
     },
 
-    {"demo", G_admin_demo, "?",
+    {"demo", G_admin_demo, "~",
       "turn admin chat off for the caller so it does not appear in demos. "
       "this is a toggle use !demo again to turn warnings back on",
       ""

src/game/g_buildable.c

@@ -1868,7 +1868,6 @@ void HMedistat_Think( gentity_t *self )
   int       i, num;
   gentity_t *player;
   qboolean  occupied = qfalse;
-  gentity_t *vic;
 
   self->nextthink = level.time + BG_FindNextThinkForBuildable( self->s.modelindex );
 
@@ -1949,14 +1948,6 @@ void HMedistat_Think( gentity_t *self )
     //nothing left to heal so go back to idling
     if( !self->enemy && self->active )
     {
-       int i;
-	
-       for( i = 0; i < level.maxclients; i++ )
-        {
-         vic = &g_entities[ i ];
-         vic->client->pers.healing = qfalse;
-	}
-    
       G_SetBuildableAnim( self, BANIM_CONSTRUCT2, qtrue );
       G_SetIdleBuildableAnim( self, BANIM_IDLE1 );
 
@@ -1971,7 +1962,6 @@ void HMedistat_Think( gentity_t *self )
         self->enemy->client->ps.stats[ STAT_STATE ] &= ~SS_MEDKIT_ACTIVE;
 
       self->enemy->health++;
-      self->enemy->client->pers.healing = qtrue;
 
       //if they're completely healed, give them a medkit
       if( self->enemy->health >= self->enemy->client->ps.stats[ STAT_MAX_HEALTH ] &&

src/game/g_cmds.c

@@ -3863,14 +3863,7 @@ Cmd_Reload_f
 */
 void Cmd_Reload_f( gentity_t *ent )
 {
-  if( !ent->client->pers.designatedBuilder && ( ent->client->ps.weapon >= WP_ABUILD ) &&
-    ( ent->client->ps.weapon <= WP_HBUILD ) )
-  {
-  
-   Cmd_Mark_f( ent );
-   return;
-  }
-  else if( ( ent->client->ps.weapon >= WP_ABUILD ) &&
+  if( ( ent->client->ps.weapon >= WP_ABUILD ) &&
     ( ent->client->ps.weapon <= WP_HBUILD ) )
   {
     Cmd_Protect_f( ent );
@@ -4704,7 +4697,7 @@ commands_t cmds[ ] = {
   { "itemact", CMD_HUMAN|CMD_LIVING, Cmd_ActivateItem_f },
   { "itemdeact", CMD_HUMAN|CMD_LIVING, Cmd_DeActivateItem_f },
   { "itemtoggle", CMD_HUMAN|CMD_LIVING, Cmd_ToggleItem_f },
-  { "reload", CMD_TEAM|CMD_LIVING, Cmd_Reload_f },
+  { "reload", CMD_HUMAN|CMD_LIVING, Cmd_Reload_f },
   { "boost", 0, Cmd_Boost_f },
   { "share", CMD_TEAM, Cmd_Share_f },
   { "donate", CMD_TEAM, Cmd_Donate_f },

src/game/g_local.h

@@ -396,7 +396,6 @@ typedef struct
   statsCounters_t statscounters;	
   qboolean            cusgrav;
   int                 cusgravlvl;
-  qboolean            healing;
   char                chat[ CHAT_MAXCHAN ][ CHAT_MAXPASS ];
   qboolean            ignoreAdminWarnings;
 
@@ -1389,8 +1388,6 @@ extern  vmCvar_t  g_deconTime;
 
 extern  vmCvar_t  g_specAspec;
 
-extern  vmCvar_t  g_healShove;
-
 extern  vmCvar_t  g_modBuildableHealth;  // Buildable health
 extern  vmCvar_t  g_modBuildableSpeed;   // Buildable fire rate
 extern  vmCvar_t  g_modHumanStamina;     // Human stamina
@@ -1400,7 +1397,6 @@ extern  vmCvar_t  g_modHumanRate;        // Human fire rate
 extern  vmCvar_t  g_modAlienRate;        // Alien fire rate
 extern  vmCvar_t  g_modWeaponAmmo;       // Weapon ammo per clip
 extern  vmCvar_t  g_modWeaponReload;     // Weapon reload time
-extern  vmCvar_t  g_modTurretAngle;      // Allow high turret build angles
 
 void      trap_Printf( const char *fmt );
 void      trap_Error( const char *fmt );

src/game/g_main.c

@@ -214,8 +214,6 @@ vmCvar_t  g_deconTime;
 
 vmCvar_t  g_specAspec;
 
-vmCvar_t  g_healShove;
-
 vmCvar_t  g_modBuildableHealth;
 vmCvar_t  g_modBuildableSpeed;
 vmCvar_t  g_modHumanStamina;
@@ -225,7 +223,6 @@ vmCvar_t  g_modHumanRate;
 vmCvar_t  g_modAlienRate;
 vmCvar_t  g_modWeaponAmmo;
 vmCvar_t  g_modWeaponReload;
-vmCvar_t  g_modTurretAngle;
 
 static cvarTable_t   gameCvarTable[ ] =
 {
@@ -267,8 +264,6 @@ static cvarTable_t   gameCvarTable[ ] =
   
   { &g_specAspec, "g_specAspec", "0", CVAR_ARCHIVE, 0, qtrue  },
 
-  { &g_healShove, "g_healShove", "0", CVAR_ARCHIVE, 0, qtrue  },
-
   { &g_modBuildableHealth, "g_modBuildableHealth", "0", CVAR_ARCHIVE, 0, qfalse  },
   { &g_modBuildableSpeed, "g_modBuildableSpeed", "0", CVAR_ARCHIVE, 0, qfalse  },
   { &g_modHumanStamina, "g_modHumanStamina", "0", CVAR_ARCHIVE, 0, qfalse  },
@@ -278,7 +273,6 @@ static cvarTable_t   gameCvarTable[ ] =
   { &g_modAlienRate, "g_modAlienRate", "0", CVAR_ARCHIVE, 0, qfalse  },
   { &g_modWeaponAmmo, "g_modWeaponAmmo", "0", CVAR_ARCHIVE, 0, qfalse  },
   { &g_modWeaponReload, "g_modWeaponReload", "0", CVAR_ARCHIVE, 0, qfalse  },
-  { &g_modTurretAngle, "g_modTurretAngle", "0", CVAR_ARCHIVE, 0, qfalse  },
   
   { &g_proximityMines, "g_proximityMines", "0", 0, 0, qtrue  },
   { &g_proximityMinesPrice, "g_proximityMinesPrice", "800", 0, 0, qtrue  },
@@ -680,7 +674,6 @@ static void G_InitModCvars( void )
   BG_MOD_set( MOD_BG_ALIEN_RATE, g_modAlienRate.integer );
   BG_MOD_set( MOD_BG_WEAPON_AMMO, g_modWeaponAmmo.integer );
   BG_MOD_set( MOD_BG_WEAPON_RELOAD, g_modWeaponReload.integer );
-  BG_MOD_set( MOD_BG_TURRET_ANGLE, g_modTurretAngle.integer );
 
   BG_MOD_update( );
 }