This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.5a
in repository iortcw.
commit ab6ca55a0d167d1140dc2f404f119bf7cbe2de4a
Author: MAN-AT-ARMS <m4n4t4...@gmail.com>
Date: Wed Aug 17 19:19:38 2016 -0400
All: Snap to correct aspect immediately after stretched effects
---
MP/code/cgame/cg_draw.c | 9 ++++++++-
SP/code/cgame/cg_draw.c | 8 ++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c
index 7f48677..a02a7ca 100644
--- a/MP/code/cgame/cg_draw.c
+++ b/MP/code/cgame/cg_draw.c
@@ -2861,6 +2861,7 @@ static void CG_DrawFlashFade( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( -10, -10, 650, 490, col );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( -10, -10, 650, 490, col );
}
@@ -2920,6 +2921,7 @@ static void CG_DrawFlashZoomTransition( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( -10, -10, 650, 490, color );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( -10, -10, 650, 490, color );
}
@@ -2959,6 +2961,7 @@ static void CG_DrawFlashDamage( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( -10, -10, 650, 490, col );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( -10, -10, 650, 490, col );
}
@@ -3012,6 +3015,7 @@ static void CG_DrawFlashFire( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_DrawPic( -10, -10, 650, 490,
cgs.media.viewFlashFire[( cg.time / 50 ) % 16] );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_DrawPic( -10, -10, 650, 490,
cgs.media.viewFlashFire[( cg.time / 50 ) % 16] );
}
@@ -3056,6 +3060,7 @@ static void CG_DrawFlashLightning( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_DrawPic( -10, -10, 650, 490, shader );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_DrawPic( -10, -10, 650, 490, shader );
}
@@ -3493,6 +3498,7 @@ static void CG_ScreenFade( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( 0, 0, 640, 480, cg.fadeColor1 );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( 0, 0, 640, 480, cg.fadeColor1 );
}
@@ -3508,7 +3514,8 @@ static void CG_ScreenFade( void ) {
if ( color[ 3 ] ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH,
PLACE_STRETCH);
- CG_FillRect( 0, 0, 640, 480, color );
+ CG_FillRect( 0, 0, 640, 480, color ):
+ CG_SetScreenPlacement(PLACE_CENTER,
PLACE_CENTER);
} else {
CG_FillRect( 0, 0, 640, 480, color );
}
diff --git a/SP/code/cgame/cg_draw.c b/SP/code/cgame/cg_draw.c
index 3f0f85a..48ce400 100644
--- a/SP/code/cgame/cg_draw.c
+++ b/SP/code/cgame/cg_draw.c
@@ -3272,6 +3272,7 @@ static void CG_DrawFlashFade( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( 0, 0, 640, 480, col );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( 0, 0, 640, 480, col ); // why do a bunch
of these extend outside 640x480?
}
@@ -3331,6 +3332,7 @@ static void CG_DrawFlashZoomTransition( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( -10, -10, 650, 490, color );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( -10, -10, 650, 490, color );
}
@@ -3370,6 +3372,7 @@ static void CG_DrawFlashDamage( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( -10, -10, 650, 490, col );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( -10, -10, 650, 490, col );
}
@@ -3427,6 +3430,7 @@ static void CG_DrawFlashFire( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_DrawPic( -10, -10, 650, 490,
cgs.media.viewFlashFire[( cg.time / 50 ) % 16] );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_DrawPic( -10, -10, 650, 490,
cgs.media.viewFlashFire[( cg.time / 50 ) % 16] );
}
@@ -3470,6 +3474,7 @@ static void CG_DrawFlashLightning( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_DrawPic( -10, -10, 650, 490, shader );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_DrawPic( -10, -10, 650, 490, shader );
}
@@ -3691,6 +3696,7 @@ static void CG_DrawGameScreenFade( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( 0, 0, 640, 480, col );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( 0, 0, 640, 480, col );
}
@@ -3729,6 +3735,7 @@ static void CG_ScreenFade( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH, PLACE_STRETCH);
CG_FillRect( 0, 0, 640, 480, cg.fadeColor1 );
+ CG_SetScreenPlacement(PLACE_CENTER, PLACE_CENTER);
} else {
CG_FillRect( 0, 0, 640, 480, cg.fadeColor1 );
}
@@ -3745,6 +3752,7 @@ static void CG_ScreenFade( void ) {
if ( cg_fixedAspect.integer ) {
CG_SetScreenPlacement(PLACE_STRETCH,
PLACE_STRETCH);
CG_FillRect( 0, 0, 640, 480, color );
+ CG_SetScreenPlacement(PLACE_CENTER,
PLACE_CENTER);
} else {
CG_FillRect( 0, 0, 640, 480, 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
