* Merge clientSession_t::sessionTeam and clientSession_t::spectatorState

* Remove existing team_t (TEAM_FREE, TEAM_SPECTATOR)
* s/pTeam_t/team_t/;s/buildableTeam_t/team_t/;s/WUTeam_t/team_t/
* s/pClass_t/class_t/
* s/PERS_TEAM/PERS_SPECSTATE/
* s/STAT_PTEAM/STAT_TEAM/;s/STAT_PCLASS/STAT_CLASS/

1 files changed, 65 insertions, 65 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 5b06eb5f..8f03f098 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -56,7 +56,7 @@ buildableAttributes_t bg_buildableList[ ] =
     ASPAWN_SPLASHDAMAGE,   //int       splashDamage;
     ASPAWN_SPLASHRADIUS,   //int       splashRadius;
     MOD_ASPAWN,            //int       meansOfDeath;
-    BIT_ALIENS,            //int       team;
+    TEAM_ALIENS,           //int       team;
     ( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -96,7 +96,7 @@ buildableAttributes_t bg_buildableList[ ] =
     BARRICADE_SPLASHDAMAGE,//int       splashDamage;
     BARRICADE_SPLASHRADIUS,//int       splashRadius;
     MOD_ASPAWN,            //int       meansOfDeath;
-    BIT_ALIENS,            //int       team;
+    TEAM_ALIENS,           //int       team;
     ( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -137,7 +137,7 @@ buildableAttributes_t bg_buildableList[ ] =
     BOOSTER_SPLASHDAMAGE,  //int       splashDamage;
     BOOSTER_SPLASHRADIUS,  //int       splashRadius;
     MOD_ASPAWN,            //int       meansOfDeath;
-    BIT_ALIENS,            //int       team;
+    TEAM_ALIENS,            //int       team;
     ( 1 << WP_ABUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -177,7 +177,7 @@ buildableAttributes_t bg_buildableList[ ] =
     ACIDTUBE_SPLASHDAMAGE, //int       splashDamage;
     ACIDTUBE_SPLASHRADIUS, //int       splashRadius;
     MOD_ASPAWN,            //int       meansOfDeath;
-    BIT_ALIENS,            //int       team;
+    TEAM_ALIENS,           //int       team;
     ( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     200,                   //int       nextthink;
@@ -216,7 +216,7 @@ buildableAttributes_t bg_buildableList[ ] =
     HIVE_SPLASHDAMAGE,     //int       splashDamage;
     HIVE_SPLASHRADIUS,     //int       splashRadius;
     MOD_ASPAWN,            //int       meansOfDeath;
-    BIT_ALIENS,            //int       team;
+    TEAM_ALIENS,            //int       team;
     ( 1 << WP_ABUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     500,                   //int       nextthink;
@@ -256,7 +256,7 @@ buildableAttributes_t bg_buildableList[ ] =
     TRAPPER_SPLASHDAMAGE,  //int       splashDamage;
     TRAPPER_SPLASHRADIUS,  //int       splashRadius;
     MOD_ASPAWN,            //int       meansOfDeath;
-    BIT_ALIENS,            //int       team;
+    TEAM_ALIENS,            //int       team;
     ( 1 << WP_ABUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -296,7 +296,7 @@ buildableAttributes_t bg_buildableList[ ] =
     OVERMIND_SPLASHDAMAGE, //int       splashDamage;
     OVERMIND_SPLASHRADIUS, //int       splashRadius;
     MOD_ASPAWN,            //int       meansOfDeath;
-    BIT_ALIENS,            //int       team;
+    TEAM_ALIENS,           //int       team;
     ( 1 << WP_ABUILD )|( 1 << WP_ABUILD2 ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     OVERMIND_ATTACK_REPEAT,//int       nextthink;
@@ -336,7 +336,7 @@ buildableAttributes_t bg_buildableList[ ] =
     HOVEL_SPLASHDAMAGE,    //int       splashDamage;
     HOVEL_SPLASHRADIUS,    //int       splashRadius;
     MOD_ASPAWN,            //int       meansOfDeath;
-    BIT_ALIENS,            //int       team;
+    TEAM_ALIENS,            //int       team;
     ( 1 << WP_ABUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     150,                   //int       nextthink;
@@ -376,7 +376,7 @@ buildableAttributes_t bg_buildableList[ ] =
     HSPAWN_SPLASHDAMAGE,   //int       splashDamage;
     HSPAWN_SPLASHRADIUS,   //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
-    BIT_HUMANS,            //int       team;
+    TEAM_HUMANS,            //int       team;
     ( 1 << WP_HBUILD ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -417,7 +417,7 @@ buildableAttributes_t bg_buildableList[ ] =
     MEDISTAT_SPLASHDAMAGE, //int       splashDamage;
     MEDISTAT_SPLASHRADIUS, //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
-    BIT_HUMANS,            //int       team;
+    TEAM_HUMANS,            //int       team;
     ( 1 << WP_HBUILD ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -459,7 +459,7 @@ buildableAttributes_t bg_buildableList[ ] =
     MGTURRET_SPLASHDAMAGE, //int       splashDamage;
     MGTURRET_SPLASHRADIUS, //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
-    BIT_HUMANS,            //int       team;
+    TEAM_HUMANS,            //int       team;
     ( 1 << WP_HBUILD ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     50,                    //int       nextthink;
@@ -499,7 +499,7 @@ buildableAttributes_t bg_buildableList[ ] =
     TESLAGEN_SPLASHDAMAGE, //int       splashDamage;
     TESLAGEN_SPLASHRADIUS, //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
-    BIT_HUMANS,            //int       team;
+    TEAM_HUMANS,            //int       team;
     ( 1 << WP_HBUILD ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     150,                   //int       nextthink;
@@ -539,7 +539,7 @@ buildableAttributes_t bg_buildableList[ ] =
     DC_SPLASHDAMAGE,       //int       splashDamage;
     DC_SPLASHRADIUS,       //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
-    BIT_HUMANS,            //int       team;
+    TEAM_HUMANS,            //int       team;
     ( 1 << WP_HBUILD ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -579,7 +579,7 @@ buildableAttributes_t bg_buildableList[ ] =
     ARMOURY_SPLASHDAMAGE,  //int       splashDamage;
     ARMOURY_SPLASHRADIUS,  //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
-    BIT_HUMANS,            //int       team;
+    TEAM_HUMANS,            //int       team;
     ( 1 << WP_HBUILD ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -619,7 +619,7 @@ buildableAttributes_t bg_buildableList[ ] =
     REACTOR_SPLASHDAMAGE,  //int       splashDamage;
     REACTOR_SPLASHRADIUS,  //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
-    BIT_HUMANS,            //int       team;
+    TEAM_HUMANS,            //int       team;
     ( 1 << WP_HBUILD ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     REACTOR_ATTACK_DCC_REPEAT, //int       nextthink;
@@ -659,7 +659,7 @@ buildableAttributes_t bg_buildableList[ ] =
     REPEATER_SPLASHDAMAGE, //int       splashDamage;
     REPEATER_SPLASHRADIUS, //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
-    BIT_HUMANS,            //int       team;
+    TEAM_HUMANS,            //int       team;
     ( 1 << WP_HBUILD ),    //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
@@ -1123,7 +1123,7 @@ int BG_FindTeamForBuildable( int bclass )
     }
   }
 
-  return BIT_NONE;
+  return TEAM_NONE;
 }
 
 /*
@@ -3235,7 +3235,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_MACHINEGUN,        //int       weaponNum;
@@ -3261,7 +3261,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_SHOTGUN,           //int       weaponNum;
@@ -3288,7 +3288,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_FLAMER,            //int       weaponNum;
@@ -3315,7 +3315,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_CHAINGUN,          //int       weaponNum;
@@ -3342,7 +3342,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_MASS_DRIVER,       //int       weaponNum;
@@ -3370,7 +3370,7 @@ weaponAttributes_t bg_weapons[ ] =
     20.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_PULSE_RIFLE,       //int       weaponNum;
@@ -3395,7 +3395,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_LUCIFER_CANNON,    //int       weaponNum;
@@ -3422,7 +3422,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_LAS_GUN,           //int       weaponNum;
@@ -3448,7 +3448,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_PAIN_SAW,          //int       weaponNum;
@@ -3475,7 +3475,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_GRENADE,           //int       weaponNum;
@@ -3500,7 +3500,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_HBUILD,            //int       weaponNum;
@@ -3527,7 +3527,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_ABUILD,            //int       weaponNum;
@@ -3552,7 +3552,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ABUILD2,           //int       weaponNum;
@@ -3577,7 +3577,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qtrue,                //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ALEVEL0,           //int       weaponNum;
@@ -3602,7 +3602,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ALEVEL1,           //int       weaponNum;
@@ -3627,7 +3627,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ALEVEL1_UPG,       //int       weaponNum;
@@ -3652,7 +3652,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ALEVEL2,           //int       weaponNum;
@@ -3677,7 +3677,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ALEVEL2_UPG,       //int       weaponNum;
@@ -3702,7 +3702,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ALEVEL3,           //int       weaponNum;
@@ -3727,7 +3727,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ALEVEL3_UPG,       //int       weaponNum;
@@ -3752,7 +3752,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qtrue,                //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_ALEVEL4,           //int       weaponNum;
@@ -3777,7 +3777,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_LOCKBLOB_LAUNCHER, //int       weaponNum;
@@ -3802,7 +3802,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_HIVE,              //int       weaponNum;
@@ -3827,7 +3827,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_ALIENS            //WUTeam_t  team;
+    TEAM_ALIENS           //team_t    team;
   },
   {
     WP_MGTURRET,          //int       weaponNum;
@@ -3852,7 +3852,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   },
   {
     WP_TESLAGEN,          //int       weaponNum;
@@ -3877,7 +3877,7 @@ weaponAttributes_t bg_weapons[ ] =
     90.0f,                //float     zoomFov;
     qfalse,               //qboolean  purchasable;
     qfalse,               //qboolean  longRanged;
-    WUT_HUMANS            //WUTeam_t  team;
+    TEAM_HUMANS           //team_t    team;
   }
 };
 
@@ -4305,7 +4305,7 @@ qboolean BG_FindLongRangedForWeapon( int weapon )
 BG_FindTeamForWeapon
 ==============
 */
-WUTeam_t BG_FindTeamForWeapon( int weapon )
+team_t BG_FindTeamForWeapon( int weapon )
 {
   int i;
 
@@ -4317,7 +4317,7 @@ WUTeam_t BG_FindTeamForWeapon( int weapon )
     }
   }
 
-  return WUT_NONE;
+  return TEAM_NONE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -4336,7 +4336,7 @@ upgradeAttributes_t bg_upgrades[ ] =
     "icons/iconu_larmour",
     qtrue,                  //qboolean purchasable
     qfalse,                 //qboolean usable
-    WUT_HUMANS              //WUTeam_t  team;
+    TEAM_HUMANS             //team_t  team;
   },
   {
     UP_HELMET,              //int   upgradeNum;
@@ -4351,7 +4351,7 @@ upgradeAttributes_t bg_upgrades[ ] =
     "icons/iconu_helmet",
     qtrue,                  //qboolean purchasable
     qfalse,                 //qboolean usable
-    WUT_HUMANS              //WUTeam_t  team;
+    TEAM_HUMANS             //team_t  team;
   },
   {
     UP_MEDKIT,              //int   upgradeNum;
@@ -4364,7 +4364,7 @@ upgradeAttributes_t bg_upgrades[ ] =
     "icons/iconu_atoxin",
     qfalse,                 //qboolean purchasable
     qtrue,                  //qboolean usable
-    WUT_HUMANS              //WUTeam_t  team;
+    TEAM_HUMANS             //team_t  team;
   },
   {
     UP_BATTPACK,            //int   upgradeNum;
@@ -4378,7 +4378,7 @@ upgradeAttributes_t bg_upgrades[ ] =
     "icons/iconu_battpack",
     qtrue,                  //qboolean purchasable
     qfalse,                 //qboolean usable
-    WUT_HUMANS              //WUTeam_t  team;
+    TEAM_HUMANS             //team_t  team;
   },
   {
     UP_JETPACK,             //int   upgradeNum;
@@ -4393,7 +4393,7 @@ upgradeAttributes_t bg_upgrades[ ] =
     "icons/iconu_jetpack",
     qtrue,                  //qboolean purchasable
     qtrue,                  //qboolean usable
-    WUT_HUMANS              //WUTeam_t  team;
+    TEAM_HUMANS             //team_t  team;
   },
   {
     UP_BATTLESUIT,          //int   upgradeNum;
@@ -4408,7 +4408,7 @@ upgradeAttributes_t bg_upgrades[ ] =
     "icons/iconu_bsuit",
     qtrue,                  //qboolean purchasable
     qfalse,                 //qboolean usable
-    WUT_HUMANS              //WUTeam_t  team;
+    TEAM_HUMANS             //team_t  team;
   },
   {
     UP_GRENADE,             //int   upgradeNum;
@@ -4422,7 +4422,7 @@ upgradeAttributes_t bg_upgrades[ ] =
     0,
     qtrue,                  //qboolean purchasable
     qtrue,                  //qboolean usable
-    WUT_HUMANS              //WUTeam_t  team;
+    TEAM_HUMANS             //team_t  team;
   },
   {
     UP_AMMO,                //int   upgradeNum;
@@ -4435,7 +4435,7 @@ upgradeAttributes_t bg_upgrades[ ] =
     0,
     qtrue,                  //qboolean purchasable
     qfalse,                 //qboolean usable
-    WUT_HUMANS              //WUTeam_t  team;
+    TEAM_HUMANS             //team_t  team;
   }
 };
 
@@ -4640,7 +4640,7 @@ qboolean BG_FindUsableForUpgrade( int upgrade )
 BG_FindTeamForUpgrade
 ==============
 */
-WUTeam_t BG_FindTeamForUpgrade( int upgrade )
+team_t BG_FindTeamForUpgrade( int upgrade )
 {
   int i;
 
@@ -4652,7 +4652,7 @@ WUTeam_t BG_FindTeamForUpgrade( int upgrade )
     }
   }
 
-  return WUT_NONE;
+  return TEAM_NONE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -4918,7 +4918,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean
 
   if( ps->pm_type == PM_INTERMISSION || ps->pm_type == PM_SPECTATOR || ps->pm_type == PM_FREEZE )
     s->eType = ET_INVISIBLE;
-  else if( ps->persistant[ PERS_TEAM ] == TEAM_SPECTATOR )
+  else if( ps->persistant[ PERS_SPECSTATE ] != SPECTATOR_NOT )
     s->eType = ET_INVISIBLE;
   else
     s->eType = ET_PLAYER;
@@ -4994,7 +4994,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean
   }
 
   // use misc field to store team/class info:
-  s->misc = ps->stats[ STAT_PTEAM ] | ( ps->stats[ STAT_PCLASS ] << 8 );
+  s->misc = ps->stats[ STAT_TEAM ] | ( ps->stats[ STAT_CLASS ] << 8 );
 
   // have to get the surfNormal through somehow...
   VectorCopy( ps->grapplePoint, s->angles2 );
@@ -5025,7 +5025,7 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s
 
   if( ps->pm_type == PM_INTERMISSION || ps->pm_type == PM_SPECTATOR || ps->pm_type == PM_FREEZE )
     s->eType = ET_INVISIBLE;
-  else if( ps->persistant[ PERS_TEAM ] == TEAM_SPECTATOR )
+  else if( ps->persistant[ PERS_SPECSTATE ] != SPECTATOR_NOT )
     s->eType = ET_INVISIBLE;
   else
     s->eType = ET_PLAYER;
@@ -5106,7 +5106,7 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s
   }
 
   // use misc field to store team/class info:
-  s->misc = ps->stats[ STAT_PTEAM ] | ( ps->stats[ STAT_PCLASS ] << 8 );
+  s->misc = ps->stats[ STAT_TEAM ] | ( ps->stats[ STAT_CLASS ] << 8 );
 
   // have to get the surfNormal through somehow...
   VectorCopy( ps->grapplePoint, s->angles2 );
@@ -5364,7 +5364,7 @@ void BG_PositionBuildableRelativeToPlayer( const playerState_t *ps,
 
   VectorCopy( ps->viewangles, angles );
   VectorCopy( ps->origin, playerOrigin );
-  buildDist = BG_FindBuildDistForClass( ps->stats[ STAT_PCLASS ] );
+  buildDist = BG_FindBuildDistForClass( ps->stats[ STAT_CLASS ] );
 
   AngleVectors( angles, forward, NULL, NULL );
   ProjectPointOnPlane( forward, forward, playerNormal );
@@ -5398,10 +5398,10 @@ int BG_GetValueOfPlayer( playerState_t *ps )
 {
   int i, worth = 0;
   
-  worth = BG_FindValueOfClass( ps->stats[ STAT_PCLASS] );
+  worth = BG_FindValueOfClass( ps->stats[ STAT_CLASS] );
 
   // Humans have worth from their equipment as well
-  if( ps->stats[ STAT_PTEAM ] == PTE_HUMANS )
+  if( ps->stats[ STAT_TEAM ] == TEAM_HUMANS )
   {
     for( i = UP_NONE + 1; i < UP_NUM_UPGRADES; i++ )
       if( BG_InventoryContainsUpgrade( i, ps->stats ) )
@@ -5594,7 +5594,7 @@ void BG_ParseCSVEquipmentList( const char *string, weapon_t *weapons, int weapon
 BG_ParseCSVClassList
 ===============
 */
-void BG_ParseCSVClassList( const char *string, pClass_t *classes, int classesSize )
+void BG_ParseCSVClassList( const char *string, class_t *classes, int classesSize )
 {
   char      buffer[ MAX_STRING_CHARS ];
   int       i = 0;
@@ -5692,7 +5692,7 @@ void BG_ParseCSVBuildableList( const char *string, buildable_t *buildables, int
 typedef struct gameElements_s
 {
   buildable_t       buildables[ BA_NUM_BUILDABLES ];
-  pClass_t          classes[ PCL_NUM_CLASSES ];
+  class_t           classes[ PCL_NUM_CLASSES ];
   weapon_t          weapons[ WP_NUM_WEAPONS ];
   upgrade_t         upgrades[ UP_NUM_UPGRADES ];
 } gameElements_t;
@@ -5771,7 +5771,7 @@ qboolean BG_UpgradeIsAllowed( upgrade_t upgrade )
 BG_ClassIsAllowed
 ============
 */
-qboolean BG_ClassIsAllowed( pClass_t class )
+qboolean BG_ClassIsAllowed( class_t class )
 {
   int i;