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/v_video.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apps/plugins/doom/v_video.h') diff --git a/apps/plugins/doom/v_video.h b/apps/plugins/doom/v_video.h index c9926e8997..c4b8927109 100644 --- a/apps/plugins/doom/v_video.h +++ b/apps/plugins/doom/v_video.h @@ -72,7 +72,7 @@ typedef enum #define CR_DEFAULT CR_RED /* default value for out of range colors */ -extern byte *screens[6]; +extern byte *d_screens[6]; extern int dirtybox[4]; extern const byte gammatable[5][256]; extern int usegamma; @@ -173,11 +173,11 @@ void V_SetPalette(int pal); // CPhipps - function to plot a pixel #ifndef GL_DOOM -#define V_PlotPixel(s,x,y,c) screens[s][x+SCREENWIDTH*y]=c +#define V_PlotPixel(s,x,y,c) d_screens[s][x+SCREENWIDTH*y]=c #endif -#define V_AllocScreen(scrn) screens[scrn] = malloc(SCREENWIDTH*SCREENHEIGHT) -#define V_FreeScreen(scrn) free(screens[scrn]); screens[scrn] = NULL +#define V_AllocScreen(scrn) d_screens[scrn] = malloc(SCREENWIDTH*SCREENHEIGHT) +#define V_FreeScreen(scrn) free(d_screens[scrn]); d_screens[scrn] = NULL #ifdef GL_DOOM #include "gl_struct.h" -- cgit v1.2.3