[iortcw] 454/497: SP: Cvar the aspect incorrect case for binocs back in

2017-09-08 Thread Simon McVittie 
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 0d4b832ffa38bee6e70a2e474b9cafb85685976c
Author: MAN-AT-ARMS 
Date:   Thu Dec 3 14:02:26 2015 -0500

SP: Cvar the aspect incorrect case for binocs back in
---
 SP/code/cgame/cg_draw.c | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c
index 683e70e..fac6979 100644
--- a/SP/code/cgame/cg_draw.c
+++ b/SP/code/cgame/cg_draw.c
@@ -2336,11 +2336,19 @@ static void CG_DrawBinocReticle( void ) {
 
if ( cgs.media.binocShaderSimpleQ ) {
CG_AdjustFrom640( &x, &y, &w, &h );
-   trap_R_DrawStretchPic( mask * cgs.screenXScale, lb * 
cgs.screenYScale, w, h, 0, 0, 1, 1, cgs.media.binocShaderSimpleQ ); // 
tl
-   trap_R_DrawStretchPic( w + mask * cgs.screenXScale, lb * 
cgs.screenYScale, w, h, 1, 0, 0, 1, cgs.media.binocShaderSimpleQ ); // tr
-   trap_R_DrawStretchPic( mask * cgs.screenXScale, h + lb * 
cgs.screenYScale, w, h, 0, 1, 1, 0, cgs.media.binocShaderSimpleQ ); // bl
-   trap_R_DrawStretchPic( w + mask * cgs.screenXScale, h + lb * 
cgs.screenYScale, w, h, 1, 1, 0, 0, cgs.media.binocShaderSimpleQ ); // br
+   if ( cg_fixedAspect.integer ) {
+   trap_R_DrawStretchPic( mask * cgs.screenXScale, lb * 
cgs.screenYScale, w, h, 0, 0, 1, 1, cgs.media.binocShaderSimpleQ ); // 
tl
+   trap_R_DrawStretchPic( w + mask * cgs.screenXScale, lb 
* cgs.screenYScale, w, h, 1, 0, 0, 1, cgs.media.binocShaderSimpleQ ); // tr
+   trap_R_DrawStretchPic( mask * cgs.screenXScale, h + lb 
* cgs.screenYScale, w, h, 0, 1, 1, 0, cgs.media.binocShaderSimpleQ ); // bl
+   trap_R_DrawStretchPic( w + mask * cgs.screenXScale, h + 
lb * cgs.screenYScale, w, h, 1, 1, 0, 0, cgs.media.binocShaderSimpleQ ); // br
+   } else {
+   trap_R_DrawStretchPic( 0, 0, w, h, 0, 0, 1, 1, 
cgs.media.binocShaderSimpleQ );  // tl
+   trap_R_DrawStretchPic( w, 0, w, h, 1, 0, 0, 1, 
cgs.media.binocShaderSimpleQ );  // tr
+   trap_R_DrawStretchPic( 0, h, w, h, 0, 1, 1, 0, 
cgs.media.binocShaderSimpleQ );  // bl
+   trap_R_DrawStretchPic( w, h, w, h, 1, 1, 0, 0, 
cgs.media.binocShaderSimpleQ );  // br
+   }
}
+   
 
CG_FillRect( 146, 239, 348, 1, color );
 

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

[iortcw] 454/497: SP: Cvar the aspect incorrect case for binocs back in

2016-09-21 Thread Simon McVittie 
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 0d4b832ffa38bee6e70a2e474b9cafb85685976c
Author: MAN-AT-ARMS 
Date:   Thu Dec 3 14:02:26 2015 -0500

SP: Cvar the aspect incorrect case for binocs back in
---
 SP/code/cgame/cg_draw.c | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c
index 683e70e..fac6979 100644
--- a/SP/code/cgame/cg_draw.c
+++ b/SP/code/cgame/cg_draw.c
@@ -2336,11 +2336,19 @@ static void CG_DrawBinocReticle( void ) {
 
if ( cgs.media.binocShaderSimpleQ ) {
CG_AdjustFrom640( &x, &y, &w, &h );
-   trap_R_DrawStretchPic( mask * cgs.screenXScale, lb * 
cgs.screenYScale, w, h, 0, 0, 1, 1, cgs.media.binocShaderSimpleQ ); // 
tl
-   trap_R_DrawStretchPic( w + mask * cgs.screenXScale, lb * 
cgs.screenYScale, w, h, 1, 0, 0, 1, cgs.media.binocShaderSimpleQ ); // tr
-   trap_R_DrawStretchPic( mask * cgs.screenXScale, h + lb * 
cgs.screenYScale, w, h, 0, 1, 1, 0, cgs.media.binocShaderSimpleQ ); // bl
-   trap_R_DrawStretchPic( w + mask * cgs.screenXScale, h + lb * 
cgs.screenYScale, w, h, 1, 1, 0, 0, cgs.media.binocShaderSimpleQ ); // br
+   if ( cg_fixedAspect.integer ) {
+   trap_R_DrawStretchPic( mask * cgs.screenXScale, lb * 
cgs.screenYScale, w, h, 0, 0, 1, 1, cgs.media.binocShaderSimpleQ ); // 
tl
+   trap_R_DrawStretchPic( w + mask * cgs.screenXScale, lb 
* cgs.screenYScale, w, h, 1, 0, 0, 1, cgs.media.binocShaderSimpleQ ); // tr
+   trap_R_DrawStretchPic( mask * cgs.screenXScale, h + lb 
* cgs.screenYScale, w, h, 0, 1, 1, 0, cgs.media.binocShaderSimpleQ ); // bl
+   trap_R_DrawStretchPic( w + mask * cgs.screenXScale, h + 
lb * cgs.screenYScale, w, h, 1, 1, 0, 0, cgs.media.binocShaderSimpleQ ); // br
+   } else {
+   trap_R_DrawStretchPic( 0, 0, w, h, 0, 0, 1, 1, 
cgs.media.binocShaderSimpleQ );  // tl
+   trap_R_DrawStretchPic( w, 0, w, h, 1, 0, 0, 1, 
cgs.media.binocShaderSimpleQ );  // tr
+   trap_R_DrawStretchPic( 0, h, w, h, 0, 1, 1, 0, 
cgs.media.binocShaderSimpleQ );  // bl
+   trap_R_DrawStretchPic( w, h, w, h, 1, 1, 0, 0, 
cgs.media.binocShaderSimpleQ );  // br
+   }
}
+   
 
CG_FillRect( 146, 239, 348, 1, color );
 

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