2 files changed, 3 insertions, 5 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 7fd6226d..104968a6 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -551,7 +551,8 @@ static qboolean CG_AtHighestClass( void )
     if( BG_ClassCanEvolveFromTo(
           cg.predictedPlayerState.stats[ STAT_PCLASS ], i,
           ALIEN_MAX_KILLS, 0 ) >= 0 &&
-        BG_FindStagesForClass( i, cgs.alienStage ) )
+        BG_FindStagesForClass( i, cgs.alienStage )
+        /*FIXME && G_ClassIsAllowed( i )*/ )
     {
       superiorClasses = qtrue;
       break;
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index 95c0de7b..5dc58e30 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -360,10 +360,7 @@ static void CG_StepOffset( void )
   else
     VectorSet( normal, 0.0f, 0.0f, 1.0f );
 
-  if( cg.snap->ps.persistant[ PERS_TEAM ] == TEAM_SPECTATOR )
-    steptime = 200;
-  else
-    steptime = BG_FindSteptimeForClass( ps->stats[ STAT_PCLASS ] );
+  steptime = BG_FindSteptimeForClass( ps->stats[ STAT_PCLASS ] );
 
   // smooth out stair climbing
   timeDelta = cg.time - cg.stepTime;