summaryrefslogtreecommitdiff
path: root/src/strife/f_wipe.c
diff options
context:
space:
mode:
authorJames Haley2011-06-30 04:07:25 +0000
committerJames Haley2011-06-30 04:07:25 +0000
commit5674a4e6f31616c3cd4ce725ef54086689245ebc (patch)
treeb25af7278d59c8d978263b9a50839b7d5846e3e6 /src/strife/f_wipe.c
parent788892b95805a7d54e2b8ed92ed8262a7b9c6d47 (diff)
downloadchocolate-doom-5674a4e6f31616c3cd4ce725ef54086689245ebc.tar.gz
chocolate-doom-5674a4e6f31616c3cd4ce725ef54086689245ebc.tar.bz2
chocolate-doom-5674a4e6f31616c3cd4ce725ef54086689245ebc.zip
Two changes:
* Be vanilla-compatible with callpoint to M_Ticker. * Use a temporary screen buffer for screen wipes to avoid overdrawing the screen during the fade process. This didn't happen in vanilla due to its refresh system. Subversion-branch: /branches/strife-branch Subversion-revision: 2352
Diffstat (limited to 'src/strife/f_wipe.c')
-rw-r--r--src/strife/f_wipe.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/strife/f_wipe.c b/src/strife/f_wipe.c
index 4c496f38..8c3eeaae 100644
--- a/src/strife/f_wipe.c
+++ b/src/strife/f_wipe.c
@@ -277,15 +277,18 @@ wipe_ScreenWipe
if (!go)
{
go = 1;
- // wipe_scr = (byte *) Z_Malloc(width*height, PU_STATIC, 0); // DEBUG
- wipe_scr = I_VideoBuffer;
+ // haleyjd 20110629 [STRIFE]: We *must* use a temp buffer here.
+ wipe_scr = (byte *) Z_Malloc(width*height, PU_STATIC, 0); // DEBUG
+ //wipe_scr = I_VideoBuffer;
(*wipes[wipeno*3])(width, height, ticks);
}
// do a piece of wipe-in
V_MarkRect(0, 0, width, height);
rc = (*wipes[wipeno*3+1])(width, height, ticks);
- // V_DrawBlock(x, y, 0, width, height, wipe_scr); // DEBUG
+
+ // haleyjd 20110629 [STRIFE]: Copy temp buffer to the real screen.
+ V_DrawBlock(x, y, width, height, wipe_scr);
// final stuff
if (rc)