Random tweaks and bug fixes

4 files changed, 22 insertions, 15 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 71df0fe3..442fff60 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -308,7 +308,7 @@ buildableAttributes_t bg_buildableList[ ] =
     150,                   //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
     BIT_HUMANS,            //int       team;
-    ( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ),    //weapon_t  buildWeapon;
+    ( 1 << WP_HBUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
     0,                     //int       turretFireSpeed;
@@ -370,7 +370,7 @@ buildableAttributes_t bg_buildableList[ ] =
     50,                    //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
     BIT_HUMANS,            //int       team;
-    ( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ),    //weapon_t  buildWeapon;
+    ( 1 << WP_HBUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     50,                    //int       nextthink;
     50,                    //int       turretFireSpeed;
@@ -400,7 +400,7 @@ buildableAttributes_t bg_buildableList[ ] =
     50,                    //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
     BIT_HUMANS,            //int       team;
-    ( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ),    //weapon_t  buildWeapon;
+    ( 1 << WP_HBUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     150,                   //int       nextthink;
     4000,                  //int       turretFireSpeed;
@@ -430,7 +430,7 @@ buildableAttributes_t bg_buildableList[ ] =
     150,                   //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
     BIT_HUMANS,            //int       team;
-    ( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ),    //weapon_t  buildWeapon;
+    ( 1 << WP_HBUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
     0,                     //int       turretFireSpeed;
@@ -460,7 +460,7 @@ buildableAttributes_t bg_buildableList[ ] =
     150,                   //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
     BIT_HUMANS,            //int       team;
-    ( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ),    //weapon_t  buildWeapon;
+    ( 1 << WP_HBUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
     0,                     //int       turretFireSpeed;
@@ -580,7 +580,7 @@ buildableAttributes_t bg_buildableList[ ] =
     150,                   //int       splashRadius;
     MOD_HSPAWN,            //int       meansOfDeath;
     BIT_HUMANS,            //int       team;
-    ( 1 << WP_HBUILD )|( 1 << WP_HBUILD2 ),    //weapon_t  buildWeapon;
+    ( 1 << WP_HBUILD2 ),   //weapon_t  buildWeapon;
     BANIM_IDLE1,           //int       idleAnim;
     100,                   //int       nextthink;
     0,                     //int       turretFireSpeed;
diff --git a/src/game/g_client.c b/src/game/g_client.c
index 597866c3..614c28d8 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -604,7 +604,16 @@ void useBody( gentity_t *self, gentity_t *other, gentity_t *activator )
     if( self->killedBy > 0 && self->killedBy != activator->client->ps.clientNum )
       return;
 
-    G_AddPredictableEvent( activator, EV_MENU, MN_A_INFEST );
+    //check the client /can/ upgrade to another class
+    for( i = PCL_NONE + 1; i < PCL_NUM_CLASSES; i++ )
+    {
+      if( BG_ClassCanEvolveFromTo( activator->client->ps.stats[ STAT_PCLASS ], i ) &&
+          BG_FindStagesForClass( i, g_alienStage.integer ) )
+        break;
+    }
+    
+    if( i < PCL_NUM_CLASSES )
+      G_AddPredictableEvent( activator, EV_MENU, MN_A_INFEST );
   }
   else
   {
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index e61fa353..6c9e457c 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -1562,7 +1562,6 @@ void Cmd_Class_f( gentity_t *ent )
   trace_t   tr;
   vec3_t    infestOrigin, infestAngles;
   int       allowedClasses[ NUM_AC ] = {  PCL_A_B_BASE,
-                                          PCL_A_B_LEV1,
                                           PCL_A_O_BASE };
 
   clientNum = ent->client - level.clients;
@@ -2203,6 +2202,10 @@ void Cmd_Build_f( gentity_t *ent )
       case IBE_NOPOWER:
         G_AddPredictableEvent( ent, EV_MENU, MN_H_NOPOWER );
         break;
+        
+      case IBE_NOCREEP:
+        G_AddPredictableEvent( ent, EV_MENU, MN_A_NOCREEP );
+        break;
     }
   }
   else
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 6d6816c9..80bf8420 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -2868,7 +2868,7 @@ UI_LoadTremAlienClasses
 */
 static void UI_LoadTremAlienClasses( )
 {
-  uiInfo.tremAlienClassCount = 3;
+  uiInfo.tremAlienClassCount = 2;
   
   uiInfo.tremAlienClassList[ 0 ].text =
     String_Alloc( BG_FindHumanNameForClassNum( PCL_A_B_BASE ) );
@@ -2876,13 +2876,8 @@ static void UI_LoadTremAlienClasses( )
     String_Alloc( va( "cmd class %s", BG_FindNameForClassNum( PCL_A_B_BASE ) ) );
   
   uiInfo.tremAlienClassList[ 1 ].text =
-    String_Alloc( BG_FindHumanNameForClassNum( PCL_A_B_LEV1 ) );
-  uiInfo.tremAlienClassList[ 1 ].cmd =
-    String_Alloc( va( "cmd class %s", BG_FindNameForClassNum( PCL_A_B_LEV1 ) ) );
-  
-  uiInfo.tremAlienClassList[ 2 ].text =
     String_Alloc( BG_FindHumanNameForClassNum( PCL_A_O_BASE ) );
-  uiInfo.tremAlienClassList[ 2 ].cmd =
+  uiInfo.tremAlienClassList[ 1 ].cmd =
     String_Alloc( va( "cmd class %s", BG_FindNameForClassNum( PCL_A_O_BASE ) ) );
 }