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 5ba26b280f3ae9596201a68dd0c006f675fc613c Author: MAN-AT-ARMS <m4n4t4...@gmail.com> Date: Mon Nov 9 16:42:56 2015 -0500 All: Fix a couple of item placements --- MP/code/cgame/cg_draw.c | 16 ++++++++-------- SP/code/cgame/cg_draw.c | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c index c5d1d4f..c58f731 100644 --- a/MP/code/cgame/cg_draw.c +++ b/MP/code/cgame/cg_draw.c @@ -872,10 +872,8 @@ 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 ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_TOP); - } else if ( cg_fixedAspect.integer == 1 ) { - CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER); } if ( cgs.gametype >= GT_TEAM ) { @@ -1225,8 +1223,10 @@ static void CG_DrawLagometer( void ) { return; } - if ( cg_fixedAspect.integer ) { + if ( cg_fixedAspect.integer == 2 ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM); + } else if ( cg_fixedAspect.integer == 1 ) { + CG_SetScreenPlacement(PLACE_CENTER, PLACE_BOTTOM); } // @@ -3210,7 +3210,7 @@ void CG_DrawObjectiveIcons( void ) { if ( cg_fixedAspect.integer == 2 ) { CG_SetScreenPlacement(PLACE_LEFT, PLACE_TOP); } else if ( cg_fixedAspect.integer == 1 ) { - CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER); + CG_SetScreenPlacement(PLACE_CENTER, PLACE_TOP); } // JPW NERVE added round timer @@ -3458,11 +3458,11 @@ void CG_Draw2D2( void ) { trap_R_SetColor( hcolor ); if ( cg_fixedAspect.integer ) { - trap_R_DrawStretchPic( 0, 480, 640, -70, 0, 0, 1, 1, cgs.media.hud1Shader ); - } else { - CG_DrawPic( 0, 480, 640, -70, cgs.media.hud1Shader ); + CG_SetScreenPlacement(PLACE_CENTER, PLACE_BOTTOM); } + CG_DrawPic( 0, 480, 640, -70, cgs.media.hud1Shader ); + if ( !( cg.snap->ps.eFlags & EF_MG42_ACTIVE ) ) { switch ( cg.snap->ps.weapon ) { case WP_COLT: diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c index 6921ab5..3d3046f 100644 --- a/SP/code/cgame/cg_draw.c +++ b/SP/code/cgame/cg_draw.c @@ -1839,8 +1839,10 @@ static void CG_DrawLagometer( void ) { return; } - if ( cg_fixedAspect.integer ) { + if ( cg_fixedAspect.integer == 2 ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_BOTTOM); + } else if ( cg_fixedAspect.integer == 1 ) { + CG_SetScreenPlacement(PLACE_CENTER, PLACE_BOTTOM); } // -- 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