This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit 9116dadb936cf4eb1c0be9d26931138fdc64d994 Author: MAN-AT-ARMS <m4n4t4...@gmail.com> Date: Fri Dec 25 17:14:03 2015 -0500 MP: Fix displaying HUD in limbo menu when using cg_fixedAspect 2 (wide) --- MP/code/cgame/cg_draw.c | 28 ++++++++++++++-------------- MP/code/cgame/cg_newdraw.c | 10 +++++----- MP/code/cgame/cg_weapons.c | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c index 17fce9c..15c9768 100644 --- a/MP/code/cgame/cg_draw.c +++ b/MP/code/cgame/cg_draw.c @@ -865,7 +865,7 @@ static void CG_DrawUpperRight(stereoFrame_t stereoFrame) { y = 0; // JPW NERVE move team overlay below obits, even with timer on left - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_TOP); } @@ -919,7 +919,7 @@ static void CG_DrawTeamInfo( void ) { return; // disabled } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement( PLACE_LEFT, PLACE_BOTTOM ); } @@ -954,7 +954,7 @@ static void CG_DrawTeamInfo( void ) { hcolor[3] = 0.33f * alphapercent; trap_R_SetColor( hcolor ); - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_DrawPic( CHATLOC_X, CHATLOC_Y - ( cgs.teamChatPos - i ) * TINYCHAR_HEIGHT, cgs.glconfig.vidWidth, TINYCHAR_HEIGHT, cgs.media.teamStatusBar ); } else { CG_DrawPic( CHATLOC_X, CHATLOC_Y - ( cgs.teamChatPos - i ) * TINYCHAR_HEIGHT, 640, TINYCHAR_HEIGHT, cgs.media.teamStatusBar ); @@ -985,7 +985,7 @@ static void CG_DrawPickupItem( void ) { float color[4]; const char *s; - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_LEFT, PLACE_BOTTOM); } @@ -1039,7 +1039,7 @@ static void CG_DrawNotify( void ) { char var[MAX_TOKEN_CHARS]; float notifytime = 1.0f; - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_LEFT, PLACE_TOP); } @@ -1181,7 +1181,7 @@ static void CG_DrawDisconnect( void ) { return; } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM); } @@ -1213,7 +1213,7 @@ static void CG_DrawLagometer( void ) { return; } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM); } @@ -2332,7 +2332,7 @@ CG_DrawSpectator ================= */ static void CG_DrawSpectator( void ) { - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_CENTER, PLACE_BOTTOM); } @@ -2356,7 +2356,7 @@ static void CG_DrawVote( void ) { float color[4] = { 1, 1, 0, 1 }; int sec; - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_LEFT, PLACE_CENTER); } @@ -2635,7 +2635,7 @@ static qboolean CG_DrawFollow( void ) { return qfalse; } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_LEFT, PLACE_TOP); } @@ -2692,7 +2692,7 @@ static void CG_DrawWarmup( void ) { return; // (SA) don't bother with this stuff in sp } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_CENTER, PLACE_TOP); } @@ -3250,7 +3250,7 @@ void CG_DrawObjectiveIcons( void ) { vec4_t hcolor = { 0.2f, 0.2f, 0.2f, 1.f }; int msec, mins, seconds, tens; // JPW NERVE - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_LEFT, PLACE_TOP); } @@ -3508,7 +3508,7 @@ void CG_Draw2D2( void ) { hcolor[3] = cg_hudAlpha.value; trap_R_SetColor( hcolor ); - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_CENTER, PLACE_BOTTOM); } @@ -3599,7 +3599,7 @@ static void CG_DrawCompass( void ) { return; } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_CENTER, PLACE_BOTTOM); } diff --git a/MP/code/cgame/cg_newdraw.c b/MP/code/cgame/cg_newdraw.c index adf15f5..7148515 100644 --- a/MP/code/cgame/cg_newdraw.c +++ b/MP/code/cgame/cg_newdraw.c @@ -288,7 +288,7 @@ static void CG_DrawPlayerWeaponIcon( rectDef_t *rect, qboolean drawHighlighted, return; } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM); } @@ -655,7 +655,7 @@ static void CG_DrawPlayerAmmoValue( rectDef_t *rect, float scale, vec4_t color, return; } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM); } @@ -1103,7 +1103,7 @@ static void CG_DrawPlayerHealth( rectDef_t *rect, float scale, vec4_t color, qha value = 0; } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_LEFT, PLACE_BOTTOM); } @@ -2215,7 +2215,7 @@ void CG_DrawWeapHeat( rectDef_t *rect, int align ) { return; } - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM); } @@ -2242,7 +2242,7 @@ static void CG_DrawFatigue( rectDef_t *rect, vec4_t color, int align ) { vec4_t colorBonus = {1, 1, 0, 0.45f}; // yellow (a little more solid for the 'bonus' stamina) int flags = 0; - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_LEFT, PLACE_BOTTOM); } diff --git a/MP/code/cgame/cg_weapons.c b/MP/code/cgame/cg_weapons.c index 4c0a80a..ca09617 100644 --- a/MP/code/cgame/cg_weapons.c +++ b/MP/code/cgame/cg_weapons.c @@ -2925,7 +2925,7 @@ void CG_DrawWeaponSelect( void ) { } trap_R_SetColor( color ); - if ( cg_fixedAspect.integer == 2 ) { + if ( cg_fixedAspect.integer == 2 && !cg.limboMenu ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_TOP); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits