diff options
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_event.c | 28 | ||||
| -rw-r--r-- | src/cgame/cg_players.c | 10 |
2 files changed, 23 insertions, 15 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index 992db57c..abf703e3 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -292,13 +292,14 @@ void CG_PainEvent( centity_t *cent, int health ) cent->pe.painDirection ^= 1; } - /* -============== -CG_Menu -============== +=============== +CG_SetUIVars + +Set some cvars used by the UI +=============== */ -void CG_Menu( int eventParm ) +void CG_SetUIVars( void ) { int i; char carriageCvar[ MAX_TOKEN_CHARS ]; @@ -321,7 +322,18 @@ void CG_Menu( int eventParm ) trap_Cvar_Set( "ui_carriage", carriageCvar ); trap_Cvar_Set( "ui_stages", va( "%d %d", cgs.alienStage, cgs.humanStage ) ); +} + +/* +============== +CG_Menu +============== +*/ +void CG_Menu( int eventParm ) +{ + CG_SetUIVars( ); + switch( eventParm ) { case MN_TEAM: trap_SendConsoleCommand( "menu tremulous_teamselect\n" ); break; @@ -411,6 +423,12 @@ void CG_Menu( int eventParm ) trap_SendConsoleCommand( "menu tremulous_alien_dialog\n" ); break; + case MN_A_NOEROOM: + trap_Cvar_Set( "ui_dialog", "There is no room to evolve here. Move away from walls or other " + "nearby objects and try again." ); + trap_SendConsoleCommand( "menu tremulous_alien_dialog\n" ); + break; + case MN_A_HIVEMIND: trap_Cvar_Set( "ui_dialog", "There can only be one Overmind. Destroy the existing one if you " "wish to move it." ); diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c index a5ce2a53..3e2235f3 100644 --- a/src/cgame/cg_players.c +++ b/src/cgame/cg_players.c @@ -2301,16 +2301,6 @@ void CG_Corpse( centity_t *cent ) //CG_AddRefEntityWithPowerups( &head, es->powerups, ci->team ); trap_R_AddRefEntityToScene( &head ); } - - if( cg.predictedPlayerState.stats[ STAT_PTEAM ] == PTE_ALIENS ) - { - if( es->powerups == cg.predictedPlayerState.clientNum || - es->powerups == 65535 ) //65535 = 16bit signed -1 - { - //draw indicator - CG_PlayerFloatSprite( cent, cgs.media.friendShader ); - } - } } |