summaryrefslogtreecommitdiff
path: root/apps/plugins/doom/i_video.c
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2006-04-06 21:31:49 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2006-04-06 21:31:49 +0000
commit0242912a2d390128fa46703f660aa11e3fee9f3a (patch)
tree91daa773d135b948cccfea6f963dbd70d43f1289 /apps/plugins/doom/i_video.c
parent2736363d715e9810cd9b720ffe4aca625cdadf8f (diff)
downloadrockbox-0242912a2d390128fa46703f660aa11e3fee9f3a.zip
rockbox-0242912a2d390128fa46703f660aa11e3fee9f3a.tar.gz
rockbox-0242912a2d390128fa46703f660aa11e3fee9f3a.tar.bz2
rockbox-0242912a2d390128fa46703f660aa11e3fee9f3a.tar.xz
Scaling code fixed by clamping down the width to a max of SCREENWIDTH. Removed some #ifdefs for glprboom
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9542 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom/i_video.c')
-rw-r--r--apps/plugins/doom/i_video.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index f7de1aa..917dace 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -16,7 +16,10 @@
* GNU General Public License for more details.
*
* $Log$
- * Revision 1.12 2006/04/05 06:37:37 kkurbjun
+ * Revision 1.13 2006/04/06 21:31:49 kkurbjun
+ * Scaling code fixed by clamping down the width to a max of SCREENWIDTH. Removed some #ifdefs for glprboom
+ *
+ * Revision 1.12 2006-04-05 06:37:37 kkurbjun
* Fix finale text and try and prevent some data corruption due to the scaling code. Also allows the non-standard GP32 mods to work with some bounds checking. More comments are in v_video.c
*
* Revision 1.11 2006-04-04 19:39:31 amiconn
@@ -82,7 +85,7 @@ static unsigned char *gbuf;
#endif
#if defined(CPU_COLDFIRE)
-static char fastscreen[(LCD_WIDTH+1)*LCD_HEIGHT] IBSS_ATTR;
+static char fastscreen[(LCD_WIDTH)*LCD_HEIGHT] IBSS_ATTR;
#endif
static fb_data palette[256] IBSS_ATTR;
static fb_data *paldata=NULL;
@@ -468,6 +471,6 @@ void I_InitGraphics(void)
d_screens[0] = fastscreen;
#else
// Don't know if this will fit in other IRAMs
- d_screens[0] = malloc ((SCREENWIDTH+1) * SCREENHEIGHT * sizeof(unsigned char));
+ d_screens[0] = malloc ((SCREENWIDTH) * SCREENHEIGHT * sizeof(unsigned char));
#endif
}