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 7c05199bec4d760adc1b66249336eb1b485c9783
Author: MAN-AT-ARMS <m4n4t4...@gmail.com>
Date:   Sun Dec 6 11:10:15 2015 -0500

    All: Some clean up
---
 MP/code/cgame/cg_draw.c      |  4 +++-
 MP/code/cgame/cg_drawtools.c | 31 -------------------------------
 MP/code/cgame/cg_local.h     |  3 ---
 MP/code/ui/ui_shared.c       | 32 --------------------------------
 MP/code/ui/ui_shared.h       |  3 ---
 SP/code/cgame/cg_draw.c      | 20 ++++----------------
 SP/code/cgame/cg_drawtools.c | 31 -------------------------------
 SP/code/cgame/cg_local.h     |  3 ---
 SP/code/ui/ui_shared.c       | 32 --------------------------------
 SP/code/ui/ui_shared.h       |  3 ---
 10 files changed, 7 insertions(+), 155 deletions(-)

diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c
index 6a856cc..7fc2594 100644
--- a/MP/code/cgame/cg_draw.c
+++ b/MP/code/cgame/cg_draw.c
@@ -3754,7 +3754,9 @@ static void CG_Draw2D(stereoFrame_t stereoFrame) {
                        CG_DrawTeamInfo();
                }
                if ( cg_drawStatus.integer ) {
-                       if ( cg_fixedAspect.integer == 2 ) {
+                       if ( cg_fixedAspect.integer == 2 && cg.limboMenu ) {
+                               CG_SetScreenPlacement(PLACE_STRETCH, 
PLACE_STRETCH);
+                       } else if ( cg_fixedAspect.integer == 2 && 
!cg.limboMenu ) {
                                CG_SetScreenPlacement(PLACE_LEFT, PLACE_BOTTOM);
                        }
 
diff --git a/MP/code/cgame/cg_drawtools.c b/MP/code/cgame/cg_drawtools.c
index 0a6d230..aab0561 100644
--- a/MP/code/cgame/cg_drawtools.c
+++ b/MP/code/cgame/cg_drawtools.c
@@ -50,37 +50,6 @@ void CG_SetScreenPlacement(screenPlacement_e hpos, 
screenPlacement_e vpos)
 
 /*
 ================
-CG_PopScreenPlacement
-================
-*/
-void CG_PopScreenPlacement(void)
-{
-       cg_horizontalPlacement = cg_lastHorizontalPlacement;
-       cg_verticalPlacement = cg_lastVerticalPlacement;
-}
-
-/*
-================
-CG_GetScreenHorizontalPlacement
-================
-*/
-screenPlacement_e CG_GetScreenHorizontalPlacement(void)
-{
-       return cg_horizontalPlacement;
-}
-
-/*
-================
-CG_GetScreenVerticalPlacement
-================
-*/
-screenPlacement_e CG_GetScreenVerticalPlacement(void)
-{
-       return cg_verticalPlacement;
-}
-
-/*
-================
 CG_AdjustFrom640
 
 Adjusted for resolution and screen aspect ratio
diff --git a/MP/code/cgame/cg_local.h b/MP/code/cgame/cg_local.h
index da54c9b..6c80ba3 100644
--- a/MP/code/cgame/cg_local.h
+++ b/MP/code/cgame/cg_local.h
@@ -1824,9 +1824,6 @@ void CG_Concussive( centity_t *cent );
 // cg_drawtools.c
 //
 void CG_SetScreenPlacement(screenPlacement_e hpos, screenPlacement_e vpos);
-void CG_PopScreenPlacement(void);
-screenPlacement_e CG_GetScreenHorizontalPlacement(void);
-screenPlacement_e CG_GetScreenVerticalPlacement(void);
 
 void CG_AdjustFrom640( float *x, float *y, float *w, float *h );
 void CG_FillRect( float x, float y, float width, float height, const float 
*color );
diff --git a/MP/code/ui/ui_shared.c b/MP/code/ui/ui_shared.c
index 252fd18..c4cab3c 100644
--- a/MP/code/ui/ui_shared.c
+++ b/MP/code/ui/ui_shared.c
@@ -116,38 +116,6 @@ void UI_SetScreenPlacement(screenPlacement_e hpos, 
screenPlacement_e vpos)
 
 /*
 ================
-UI_PopScreenPlacement
-================
-*/
-void UI_PopScreenPlacement(void)
-{
-       ui_horizontalPlacement = ui_lastHorizontalPlacement;
-       ui_verticalPlacement = ui_lastVerticalPlacement;
-}
-
-/*
-================
-UI_GetScreenHorizontalPlacement
-================
-*/
-screenPlacement_e UI_GetScreenHorizontalPlacement(void)
-{
-       return ui_horizontalPlacement;
-}
-
-/*
-================
-UI_GetScreenVerticalPlacement
-================
-*/
-screenPlacement_e UI_GetScreenVerticalPlacement(void)
-{
-       return ui_verticalPlacement;
-}
-
-
-/*
-================
 UI_AdjustFrom640
 
 Adjusted for resolution and screen aspect ratio
diff --git a/MP/code/ui/ui_shared.h b/MP/code/ui/ui_shared.h
index 09478ed..d4fb4f5 100644
--- a/MP/code/ui/ui_shared.h
+++ b/MP/code/ui/ui_shared.h
@@ -496,8 +496,5 @@ int         trap_PC_ReadToken( int handle, pc_token_t 
*pc_token );
 int         trap_PC_SourceFileAndLine( int handle, char *filename, int *line );
 
 void UI_SetScreenPlacement(screenPlacement_e hpos, screenPlacement_e vpos);
-void UI_PopScreenPlacement(void);
-screenPlacement_e UI_GetScreenHorizontalPlacement(void);
-screenPlacement_e UI_GetScreenVerticalPlacement(void);
 
 #endif
diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c
index 06e4986..08d7ae0 100644
--- a/SP/code/cgame/cg_draw.c
+++ b/SP/code/cgame/cg_draw.c
@@ -649,28 +649,16 @@ static void CG_DrawStatusBar( void ) {
                hcolor[2] = 0;
                hcolor[3] = 0.33;
                trap_R_SetColor( hcolor );
-               if ( cg_fixedAspect.integer ) {
-                       CG_SetScreenPlacement(PLACE_STRETCH, 
CG_GetScreenVerticalPlacement());
-                       CG_DrawPic( 0, 420, 640, 60, cgs.media.teamStatusBar );
-                       CG_PopScreenPlacement();
-               } else {
-                       CG_DrawPic( 0, 420, 640, 60, cgs.media.teamStatusBar );
-                       trap_R_SetColor( NULL );
-               }
+               CG_DrawPic( 0, 420, 640, 60, cgs.media.teamStatusBar );
+               trap_R_SetColor( NULL );
        } else if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_BLUE ) {
                hcolor[0] = 0;
                hcolor[1] = 0;
                hcolor[2] = 1;
                hcolor[3] = 0.33;
                trap_R_SetColor( hcolor );
-               if ( cg_fixedAspect.integer ) {
-                       CG_SetScreenPlacement(PLACE_STRETCH, 
CG_GetScreenVerticalPlacement());
-                       CG_DrawPic( 0, 420, 640, 60, cgs.media.teamStatusBar );
-                       CG_PopScreenPlacement();
-               } else {
-                       CG_DrawPic( 0, 420, 640, 60, cgs.media.teamStatusBar );
-                       trap_R_SetColor( NULL );
-               }
+               CG_DrawPic( 0, 420, 640, 60, cgs.media.teamStatusBar );
+               trap_R_SetColor( NULL );
        }
 
        cent = &cg_entities[cg.snap->ps.clientNum];
diff --git a/SP/code/cgame/cg_drawtools.c b/SP/code/cgame/cg_drawtools.c
index 55d65ed..fdecd7e 100644
--- a/SP/code/cgame/cg_drawtools.c
+++ b/SP/code/cgame/cg_drawtools.c
@@ -50,37 +50,6 @@ void CG_SetScreenPlacement(screenPlacement_e hpos, 
screenPlacement_e vpos)
 
 /*
 ================
-CG_PopScreenPlacement
-================
-*/
-void CG_PopScreenPlacement(void)
-{
-       cg_horizontalPlacement = cg_lastHorizontalPlacement;
-       cg_verticalPlacement = cg_lastVerticalPlacement;
-}
-
-/*
-================
-CG_GetScreenHorizontalPlacement
-================
-*/
-screenPlacement_e CG_GetScreenHorizontalPlacement(void)
-{
-       return cg_horizontalPlacement;
-}
-
-/*
-================
-CG_GetScreenVerticalPlacement
-================
-*/
-screenPlacement_e CG_GetScreenVerticalPlacement(void)
-{
-       return cg_verticalPlacement;
-}
-
-/*
-================
 CG_AdjustFrom640
 
 Adjusted for resolution and screen aspect ratio
diff --git a/SP/code/cgame/cg_local.h b/SP/code/cgame/cg_local.h
index 86d32e6..a086ead 100644
--- a/SP/code/cgame/cg_local.h
+++ b/SP/code/cgame/cg_local.h
@@ -1832,9 +1832,6 @@ void CG_Concussive( centity_t *cent );
 // cg_drawtools.c
 //
 void CG_SetScreenPlacement(screenPlacement_e hpos, screenPlacement_e vpos);
-void CG_PopScreenPlacement(void);
-screenPlacement_e CG_GetScreenHorizontalPlacement(void);
-screenPlacement_e CG_GetScreenVerticalPlacement(void);
 
 void CG_AdjustFrom640( float *x, float *y, float *w, float *h );
 void CG_FillRect( float x, float y, float width, float height, const float 
*color );
diff --git a/SP/code/ui/ui_shared.c b/SP/code/ui/ui_shared.c
index 9a89ab7..012c147 100644
--- a/SP/code/ui/ui_shared.c
+++ b/SP/code/ui/ui_shared.c
@@ -169,38 +169,6 @@ void UI_SetScreenPlacement(screenPlacement_e hpos, 
screenPlacement_e vpos)
 
 /*
 ================
-UI_PopScreenPlacement
-================
-*/
-void UI_PopScreenPlacement(void)
-{
-       ui_horizontalPlacement = ui_lastHorizontalPlacement;
-       ui_verticalPlacement = ui_lastVerticalPlacement;
-}
-
-/*
-================
-UI_GetScreenHorizontalPlacement
-================
-*/
-screenPlacement_e UI_GetScreenHorizontalPlacement(void)
-{
-       return ui_horizontalPlacement;
-}
-
-/*
-================
-UI_GetScreenVerticalPlacement
-================
-*/
-screenPlacement_e UI_GetScreenVerticalPlacement(void)
-{
-       return ui_verticalPlacement;
-}
-
-
-/*
-================
 UI_AdjustFrom640
 
 Adjusted for resolution and screen aspect ratio
diff --git a/SP/code/ui/ui_shared.h b/SP/code/ui/ui_shared.h
index 36d5b51..ca4d681 100644
--- a/SP/code/ui/ui_shared.h
+++ b/SP/code/ui/ui_shared.h
@@ -506,8 +506,5 @@ int         trap_PC_ReadToken( int handle, pc_token_t 
*pc_token );
 int         trap_PC_SourceFileAndLine( int handle, char *filename, int *line );
 
 void UI_SetScreenPlacement(screenPlacement_e hpos, screenPlacement_e vpos);
-void UI_PopScreenPlacement(void);
-screenPlacement_e UI_GetScreenHorizontalPlacement(void);
-screenPlacement_e UI_GetScreenVerticalPlacement(void);
 
 #endif

-- 
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

Reply via email to