diff options
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_draw.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_servercmds.c | 27 | ||||
| -rw-r--r-- | src/cgame/cg_tutorial.c | 19 | ||||
| -rw-r--r-- | src/cgame/cg_weapons.c | 3 |
4 files changed, 3 insertions, 50 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index ebdac7fd..5c7bfac7 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -2387,8 +2387,7 @@ static void CG_DrawCrosshair( rectDef_t *rect, vec4_t color ) !BG_Weapon( weapon )->longRanged ) return; - if( ( cg.snap->ps.persistant[ PERS_SPECSTATE ] != SPECTATOR_NOT ) || - ( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) ) + if( cg.snap->ps.persistant[ PERS_SPECSTATE ] != SPECTATOR_NOT ) return; if( cg.renderingThirdPerson ) @@ -3265,7 +3264,6 @@ static void CG_Draw2D( void ) } if( cg.snap->ps.persistant[ PERS_SPECSTATE ] == SPECTATOR_NOT && - !( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) && cg.snap->ps.stats[ STAT_HEALTH ] > 0 ) { menu = Menus_FindByName( BG_ClassConfig( diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index 83f8f818..63db2ffe 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -771,13 +771,6 @@ void CG_Menu( int menu, int arg ) type = DT_BUILD; break; - case MN_A_ONEHOVEL: - longMsg = "There can only be one Hovel. Deconstruct the existing one if you " - "wish to move it."; - shortMsg = "There can only be one Hovel"; - type = DT_BUILD; - break; - case MN_A_NOBP: longMsg = "The Overmind cannot control any more structures. Deconstruct existing " "structures to build more."; @@ -812,26 +805,6 @@ void CG_Menu( int menu, int arg ) type = DT_ARMOURYEVOLVE; break; - case MN_A_HOVEL_OCCUPIED: - longMsg = "This Hovel is already occupied by another builder."; - shortMsg = "This Hovel is already occupied by another builder"; - type = DT_COMMAND; - break; - - case MN_A_HOVEL_BLOCKED: - longMsg = "The exit to this Hovel is currently blocked. Please wait until it " - "becomes clear then try again."; - shortMsg = "The exit to this Hovel is currently blocked"; - type = DT_COMMAND; - break; - - case MN_A_HOVEL_EXIT: - longMsg = "The exit to this Hovel would always be blocked. Please choose " - "a more suitable location."; - shortMsg = "The exit to this Hovel would always be blocked"; - type = DT_BUILD; - break; - case MN_A_INFEST: trap_Cvar_Set( "ui_currentClass", va( "%d %d", cg.snap->ps.stats[ STAT_CLASS ], diff --git a/src/cgame/cg_tutorial.c b/src/cgame/cg_tutorial.c index 28417f68..1bc4ac8f 100644 --- a/src/cgame/cg_tutorial.c +++ b/src/cgame/cg_tutorial.c @@ -669,24 +669,7 @@ const char *CG_TutorialText( void ) if( ps->stats[ STAT_TEAM ] == TEAM_ALIENS ) { - entityState_t *es = CG_BuildableInRange( ps, NULL ); - - if( ps->stats[ STAT_STATE ] & SS_HOVELING ) - { - Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "Press %s to exit the hovel\n", - CG_KeyNameForCommand( "+button7" ) ) ); - } - else if( es && es->modelindex == BA_A_HOVEL && - ( es->eFlags & EF_B_SPAWNED ) && - ( ps->stats[ STAT_CLASS ] == PCL_ALIEN_BUILDER0 || - ps->stats[ STAT_CLASS ] == PCL_ALIEN_BUILDER0_UPG ) ) - { - Q_strcat( text, MAX_TUTORIAL_TEXT, - va( "Press %s to enter the hovel\n", - CG_KeyNameForCommand( "+button7" ) ) ); - } - else if( BG_AlienCanEvolve( ps->stats[ STAT_CLASS ], + if( BG_AlienCanEvolve( ps->stats[ STAT_CLASS ], ps->persistant[ PERS_CREDIT ], cgs.alienStage ) ) { diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 8044fbf1..a166bf94 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -1218,8 +1218,7 @@ void CG_AddViewWeapon( playerState_t *ps ) wi = &cg_weapons[ weapon ]; cent = &cg.predictedPlayerEntity; // &cg_entities[cg.snap->ps.clientNum]; - if( ( ps->persistant[PERS_SPECSTATE] != SPECTATOR_NOT ) || - ( ps->stats[ STAT_STATE ] & SS_HOVELING ) ) + if( ps->persistant[PERS_SPECSTATE] != SPECTATOR_NOT ) return; // no weapon carried - can't draw it |