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 b42b39ce1d0259b516c9b44edb8080c949300a53 Author: MAN-AT-ARMS <m4n4t4...@gmail.com> Date: Tue Nov 24 17:49:44 2015 -0500 All: Fix upper right placement --- MP/code/cgame/cg_draw.c | 6 +++++- SP/code/cgame/cg_draw.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c index c58f731..c59645e 100644 --- a/MP/code/cgame/cg_draw.c +++ b/MP/code/cgame/cg_draw.c @@ -534,6 +534,7 @@ void CG_DrawTeamBackground( int x, int y, int w, int h, float alpha, int team ) */ #define UPPERRIGHT_X 500 + /* ================== CG_DrawSnapshot @@ -708,6 +709,7 @@ static float CG_DrawTeamOverlay( float y ) { pwidth = TEAM_OVERLAY_MAXNAME_WIDTH; } + #if 1 // max location name width lwidth = 0; @@ -872,8 +874,10 @@ 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 ) { + if ( cg_fixedAspect.integer == 2 ) { CG_SetScreenPlacement(PLACE_RIGHT, PLACE_TOP); + } else if ( cg_fixedAspect.integer == 1 ) { + CG_SetScreenPlacement(PLACE_CENTER, PLACE_TOP); } if ( cgs.gametype >= GT_TEAM ) { diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c index 69b7432..46bcd83 100644 --- a/SP/code/cgame/cg_draw.c +++ b/SP/code/cgame/cg_draw.c @@ -1227,9 +1227,9 @@ static void CG_DrawUpperRight(stereoFrame_t stereoFrame) { y = 0; if ( cg_fixedAspect.integer == 2 ) { - CG_SetScreenPlacement(PLACE_RIGHT, PLACE_CENTER); + CG_SetScreenPlacement(PLACE_RIGHT, PLACE_TOP); } else if ( cg_fixedAspect.integer == 1 ) { - CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER); + CG_SetScreenPlacement(PLACE_CENTER, PLACE_TOP); } if ( cgs.gametype >= GT_TEAM ) { -- 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