diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-08-23 00:22:20 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2007-08-23 00:22:20 +0000 |
| commit | 3ac0cab7a7a47a07b71755c59bab24e0b70088bd (patch) | |
| tree | 08f539ee044c124f4878c7a945922e4c59e99fcd /code/cgame | |
| parent | 37c20d0ddfb0b25296cabe9755231ceb2b43dedd (diff) | |
| download | ioquake3-aero-3ac0cab7a7a47a07b71755c59bab24e0b70088bd.tar.gz ioquake3-aero-3ac0cab7a7a47a07b71755c59bab24e0b70088bd.zip | |
* (bug 3076) Map cycle breaks on empty or bot only servers (misanthropia)
* (bug 3303) Removal of never compiled code from cgame drawing functions (beast
<info@dbwatersports.com>)
* (bug 3297) Add missing limit to Q3 UI server info (beast
<info@dbwatersports.com>)
* (bug 3029) Fix to shader hash table being overpopulated (identified by
Stefan "#@" Langer <raute_at@gmx.de>)
git-svn-id: svn://svn.icculus.org/quake3/trunk@1129 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/cgame')
| -rw-r--r-- | code/cgame/cg_draw.c | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c index 59219ef..b4fe564 100644 --- a/code/cgame/cg_draw.c +++ b/code/cgame/cg_draw.c @@ -530,9 +530,7 @@ static void CG_DrawStatusBar( void ) { vec4_t hcolor; vec3_t angles; vec3_t origin; -#ifdef MISSIONPACK - qhandle_t handle; -#endif + static float colors[4][4] = { // { 0.2, 1.0, 0.2, 1.0 } , { 1.0, 0.2, 0.2, 1.0 }, {0.5, 0.5, 0.5, 1} }; { 1.0f, 0.69f, 0.0f, 1.0f }, // normal @@ -580,20 +578,6 @@ static void CG_DrawStatusBar( void ) { CG_Draw3DModel( 370 + CHAR_WIDTH*3 + TEXT_ICON_SPACE, 432, ICON_SIZE, ICON_SIZE, cgs.media.armorModel, 0, origin, angles ); } -#ifdef MISSIONPACK - if( cgs.gametype == GT_HARVESTER ) { - origin[0] = 90; - origin[1] = 0; - origin[2] = -10; - angles[YAW] = ( cg.time & 2047 ) * 360 / 2048.0; - if( cg.snap->ps.persistant[PERS_TEAM] == TEAM_BLUE ) { - handle = cgs.media.redCubeModel; - } else { - handle = cgs.media.blueCubeModel; - } - CG_Draw3DModel( 640 - (TEXT_ICON_SPACE + ICON_SIZE), 416, ICON_SIZE, ICON_SIZE, handle, 0, origin, angles ); - } -#endif // // ammo // @@ -663,29 +647,6 @@ static void CG_DrawStatusBar( void ) { } } -#ifdef MISSIONPACK - // - // cubes - // - if( cgs.gametype == GT_HARVESTER ) { - value = ps->generic1; - if( value > 99 ) { - value = 99; - } - trap_R_SetColor( colors[0] ); - CG_DrawField (640 - (CHAR_WIDTH*2 + TEXT_ICON_SPACE + ICON_SIZE), 432, 2, value); - trap_R_SetColor( NULL ); - // if we didn't draw a 3D icon, draw a 2D icon for armor - if ( !cg_draw3dIcons.integer && cg_drawIcons.integer ) { - if( cg.snap->ps.persistant[PERS_TEAM] == TEAM_BLUE ) { - handle = cgs.media.redCubeIcon; - } else { - handle = cgs.media.blueCubeIcon; - } - CG_DrawPic( 640 - (TEXT_ICON_SPACE + ICON_SIZE), 432, ICON_SIZE, ICON_SIZE, handle ); - } - } -#endif } #endif @@ -1122,19 +1083,6 @@ static float CG_DrawScores( float y ) { } } -#ifdef MISSIONPACK - if ( cgs.gametype == GT_1FCTF ) { - // Display flag status - item = BG_FindItemForPowerup( PW_NEUTRALFLAG ); - - if (item) { - y1 = y - BIGCHAR_HEIGHT - 8; - if( cgs.flagStatus >= 0 && cgs.flagStatus <= 3 ) { - CG_DrawPic( x, y1-4, w, BIGCHAR_HEIGHT+8, cgs.media.flagShader[cgs.flagStatus] ); - } - } - } -#endif if ( cgs.gametype >= GT_CTF ) { v = cgs.capturelimit; } else { |