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

1 files changed, 2 insertions, 2 deletions

diff --git a/apps/plugins/doom/r_draw.c b/apps/plugins/doom/r_draw.c
index b6d84f0dff..a6bc21e420 100644
--- a/apps/plugins/doom/r_draw.c
+++ b/apps/plugins/doom/r_draw.c
@@ -573,7 +573,7 @@ void R_InitBuffer(int width, int height)
 
    viewwindowy = width==SCREENWIDTH ? 0 : (SCREENHEIGHT-(ST_SCALED_HEIGHT-1)-height)>>1;
 
-   topleft = screens[0] + viewwindowy*SCREENWIDTH + viewwindowx;
+   topleft = d_screens[0] + viewwindowy*SCREENWIDTH + viewwindowx;
 
    // Preclaculate all row offsets.
    // CPhipps - merge viewwindowx into here
@@ -627,7 +627,7 @@ void R_FillBackScreen (void)
 
 void R_VideoErase(unsigned ofs, int count)
 {
-   memcpy(screens[0]+ofs, screens[1]+ofs, count);   // LFB copy.
+   memcpy(d_screens[0]+ofs, d_screens[1]+ofs, count);   // LFB copy.
 }
 
 //