summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2006-04-13 18:36:11 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2006-04-13 18:36:11 +0000
commit22a81d7c76e5d4618ae1102a3a7003dcf3b577b0 (patch)
tree89c59f5e91b50088a92100d1b15a191beb5002d7 /apps
parent0744e760cb65301b6ba682f505f848af51b3b2ef (diff)
downloadrockbox-22a81d7c76e5d4618ae1102a3a7003dcf3b577b0.zip
rockbox-22a81d7c76e5d4618ae1102a3a7003dcf3b577b0.tar.gz
rockbox-22a81d7c76e5d4618ae1102a3a7003dcf3b577b0.tar.bz2
rockbox-22a81d7c76e5d4618ae1102a3a7003dcf3b577b0.tar.xz
Prevent non-standard wads (most notably GP32 wads) that should not run from ever making it into game (avoid freezes, data aborts, memory corruption, etc..)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9647 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/doom/v_video.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/plugins/doom/v_video.c b/apps/plugins/doom/v_video.c
index da53311..95c396e 100644
--- a/apps/plugins/doom/v_video.c
+++ b/apps/plugins/doom/v_video.c
@@ -418,15 +418,14 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch,
x -= SHORT(patch->leftoffset);
// // CPhipps - auto-no-stretch if not high-res
-// if (flags & VPT_STRETCH)
-// if ((SCREENWIDTH==320) && (SCREENHEIGHT==200))
-// flags &= ~VPT_STRETCH;
+ if (flags & VPT_STRETCH)
+ if ((SCREENWIDTH==320) && (SCREENHEIGHT==200))
+ flags &= ~VPT_STRETCH;
// CPhipps - null translation pointer => no translation
if (!trans)
flags &= ~VPT_TRANS;
-#ifdef RANGECHECK
if (x<0
||x+SHORT(patch->width) > ((flags & VPT_STRETCH) ? 320 : SCREENWIDTH)
|| y<0
@@ -434,7 +433,6 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch,
// killough 1/19/98: improved error message:
I_Error("V_DrawMemPatch: Patch (%d,%d)-(%d,%d) exceeds LFB Bad V_DrawMemPatch (flags=%u)",
x, y, x+SHORT(patch->width), y+SHORT(patch->height), flags);
-#endif
if (!(flags & VPT_STRETCH)) {
unsigned int col;