diff options
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_draw.c | 24 | ||||
| -rw-r--r-- | src/cgame/cg_event.c | 22 |
2 files changed, 41 insertions, 5 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 02e77449..1c2067ca 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -548,8 +548,6 @@ static void CG_DrawStatusBar( void ) { int awidth = (int)( (float)allocated / ( total / PWR_WIDTH ) ); int pwidth = (int)( (float)powered / ( total / PWR_WIDTH ) ); vec4_t bcolor = { 0.5, 0.5, 0.5, 0.5 }; - - //Com_Printf( "%d %d %d\n", allocated, powered, total ); trap_R_SetColor( bcolor ); // white CG_DrawPic( PWR_X, PWR_Y, PWR_WIDTH, PWR_HEIGHT, cgs.media.whiteShader ); @@ -565,6 +563,28 @@ static void CG_DrawStatusBar( void ) { } // + // hive + // + #define HV_HEIGHT 10 + #define HV_WIDTH 80 + #define HV_X 555 + #define HV_Y 20 + if( ps->stats[ STAT_PTEAM ] == PTE_DROIDS ) + { + int total = cgs.dBuildPointsTotal; + int allocated = total - cgs.dBuildPoints; + + int awidth = (int)( (float)allocated / ( total / HV_WIDTH ) ); + vec4_t bcolor = { 0.5, 0.5, 0.5, 0.5 }; + + trap_R_SetColor( bcolor ); // white + CG_DrawPic( HV_X, HV_Y, HV_WIDTH, HV_HEIGHT, cgs.media.whiteShader ); + + trap_R_SetColor( colors[0] ); // green + CG_DrawPic( HV_X, HV_Y, awidth, HV_HEIGHT, cgs.media.whiteShader ); + } + + // // health+armor // if( ps->stats[ STAT_PTEAM ] == PTE_DROIDS ) diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index 851022b8..0e62f75d 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -147,10 +147,10 @@ static void CG_Obituary( entityState_t *ent ) { message = "was in the wrong place"; break; case MOD_HSPAWN: - message = "should have run further"; + message = "should have run further"; break; - case MOD_ASPAWN: - message = "was melted by the acid blood"; + case MOD_DSPAWN: + message = "was melted by the acid blood"; break; default: message = NULL; @@ -466,6 +466,22 @@ void CG_Menu( int eventParm ) trap_SendConsoleCommand( "menu dnocreep\n" ); break; + case MN_D_NOHVMND: + trap_SendConsoleCommand( "menu dnohvmnd\n" ); + break; + + case MN_D_HIVEMIND: + trap_SendConsoleCommand( "menu dhivemind\n" ); + break; + + case MN_D_NOASSERT: + trap_SendConsoleCommand( "menu dnoassert\n" ); + break; + + case MN_D_SPWNWARN: + trap_SendConsoleCommand( "menu dspwnwarn\n" ); + break; + case MN_H_REACTOR: trap_SendConsoleCommand( "menu hreactor\n" ); break; |