From 38deb8f13a9896f2d6eb884c6a8bbc9b10001255 Mon Sep 17 00:00:00 2001 From: Hristo Kovachev Date: Mon, 3 Apr 2006 08:51:08 +0000 Subject: Patch #4864 by Jonathan Gordon: text editor plugin, with some changes by me. Also correct a var clash between the rockbox's gui api and doom plugin git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9451 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/doom/f_wipe.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/plugins/doom/f_wipe.c') diff --git a/apps/plugins/doom/f_wipe.c b/apps/plugins/doom/f_wipe.c index a6251f295e..f51224f5ce 100644 --- a/apps/plugins/doom/f_wipe.c +++ b/apps/plugins/doom/f_wipe.c @@ -140,7 +140,7 @@ static int wipe_doMelt(int width, int height, int ticks) return done; } -// CPhipps - modified to allocate and deallocate screens[2 to 3] as needed, saving memory +// CPhipps - modified to allocate and deallocate d_screens[2 to 3] as needed, saving memory static int wipe_exitMelt(int width, int height, int ticks) { @@ -152,20 +152,20 @@ static int wipe_exitMelt(int width, int height, int ticks) free(wipe_scr_end); // Paranoia y = NULL; - wipe_scr_start = wipe_scr_end = screens[SRC_SCR] = screens[DEST_SCR] = NULL; + wipe_scr_start = wipe_scr_end = d_screens[SRC_SCR] = d_screens[DEST_SCR] = NULL; return 0; } int wipe_StartScreen(int x, int y, int width, int height) { - wipe_scr_start = screens[SRC_SCR] = malloc(SCREENWIDTH * SCREENHEIGHT); + wipe_scr_start = d_screens[SRC_SCR] = malloc(SCREENWIDTH * SCREENHEIGHT); V_CopyRect(x, y, 0, width, height, x, y, SRC_SCR, VPT_NONE ); // Copy start screen to buffer return 0; } int wipe_EndScreen(int x, int y, int width, int height) { - wipe_scr_end = screens[DEST_SCR] = malloc(SCREENWIDTH * SCREENHEIGHT); + wipe_scr_end = d_screens[DEST_SCR] = malloc(SCREENWIDTH * SCREENHEIGHT); V_CopyRect(x, y, 0, width, height, x, y, DEST_SCR, VPT_NONE); // Copy end screen to buffer V_CopyRect(x, y, SRC_SCR, width, height, x, y, 0 , VPT_NONE); // restore start screen return 0; @@ -180,7 +180,7 @@ int wipe_ScreenWipe(int x, int y, int width, int height, int ticks) if (!go) // initial stuff { go = 1; - wipe_scr = screens[0]; + wipe_scr = d_screens[0]; wipe_initMelt(width, height, ticks); } V_MarkRect(0, 0, width, height); // do a piece of wipe-in -- cgit v1.2.3