summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2008-09-20 19:44:25 +0000
committerSimon Howard2008-09-20 19:44:25 +0000
commite2e44080a665c68dffdf1863fd1902be395adb10 (patch)
tree6f1e57b3e72a1a11302f6e92a378cb7a23a80f7f
parent90056c594d74eb1b938e34d02833435bd23e0bf7 (diff)
downloadchocolate-doom-e2e44080a665c68dffdf1863fd1902be395adb10.tar.gz
chocolate-doom-e2e44080a665c68dffdf1863fd1902be395adb10.tar.bz2
chocolate-doom-e2e44080a665c68dffdf1863fd1902be395adb10.zip
Make the wipe code use dynamically allocated transition screens.
Subversion-branch: /branches/raven-branch Subversion-revision: 1244
-rw-r--r--src/doom/f_wipe.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/doom/f_wipe.c b/src/doom/f_wipe.c
index 2ab66848..0c352469 100644
--- a/src/doom/f_wipe.c
+++ b/src/doom/f_wipe.c
@@ -230,6 +230,8 @@ wipe_exitMelt
int ticks )
{
Z_Free(y);
+ Z_Free(wipe_scr_start);
+ Z_Free(wipe_scr_end);
return 0;
}
@@ -240,7 +242,7 @@ wipe_StartScreen
int width,
int height )
{
- wipe_scr_start = screens[2];
+ wipe_scr_start = Z_Malloc(SCREENWIDTH * SCREENHEIGHT, PU_STATIC, NULL);
I_ReadScreen(wipe_scr_start);
return 0;
}
@@ -252,7 +254,7 @@ wipe_EndScreen
int width,
int height )
{
- wipe_scr_end = screens[3];
+ wipe_scr_end = Z_Malloc(SCREENWIDTH * SCREENHEIGHT, PU_STATIC, NULL);
I_ReadScreen(wipe_scr_end);
V_DrawBlock(x, y, 0, width, height, wipe_scr_start); // restore start scr.
return 0;
@@ -298,5 +300,5 @@ wipe_ScreenWipe
}
return !go;
-
}
+