diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-17 19:54:18 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-17 19:54:18 +0000 |
commit | 6b90467f698fb5611b6cfe3ff2c9b06bef1cb248 (patch) | |
tree | ed5aff248d48b68cbda33fa1f01a8ac198fbb10f /apps/plugins/doom/v_video.c | |
parent | 08b417f149f061f7923d4acc2a950bcbaa49b6fa (diff) | |
download | rockbox-6b90467f698fb5611b6cfe3ff2c9b06bef1cb248.tar.gz rockbox-6b90467f698fb5611b6cfe3ff2c9b06bef1cb248.zip |
Add better error message for messed up graphics.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9707 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom/v_video.c')
-rw-r--r-- | apps/plugins/doom/v_video.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/plugins/doom/v_video.c b/apps/plugins/doom/v_video.c index 95c396ecf4..167316beae 100644 --- a/apps/plugins/doom/v_video.c +++ b/apps/plugins/doom/v_video.c | |||
@@ -417,7 +417,7 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, | |||
417 | y -= SHORT(patch->topoffset); | 417 | y -= SHORT(patch->topoffset); |
418 | x -= SHORT(patch->leftoffset); | 418 | x -= SHORT(patch->leftoffset); |
419 | 419 | ||
420 | // // CPhipps - auto-no-stretch if not high-res | 420 | // CPhipps - auto-no-stretch if not high-res |
421 | if (flags & VPT_STRETCH) | 421 | if (flags & VPT_STRETCH) |
422 | if ((SCREENWIDTH==320) && (SCREENHEIGHT==200)) | 422 | if ((SCREENWIDTH==320) && (SCREENHEIGHT==200)) |
423 | flags &= ~VPT_STRETCH; | 423 | flags &= ~VPT_STRETCH; |
@@ -430,9 +430,12 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch, | |||
430 | ||x+SHORT(patch->width) > ((flags & VPT_STRETCH) ? 320 : SCREENWIDTH) | 430 | ||x+SHORT(patch->width) > ((flags & VPT_STRETCH) ? 320 : SCREENWIDTH) |
431 | || y<0 | 431 | || y<0 |
432 | || y+SHORT(patch->height) > ((flags & VPT_STRETCH) ? 200 : SCREENHEIGHT)) | 432 | || y+SHORT(patch->height) > ((flags & VPT_STRETCH) ? 200 : SCREENHEIGHT)) |
433 | { | ||
434 | rb->splash(HZ*2, true, "This wad does not follow standard doom graphics!"); | ||
433 | // killough 1/19/98: improved error message: | 435 | // killough 1/19/98: improved error message: |
434 | I_Error("V_DrawMemPatch: Patch (%d,%d)-(%d,%d) exceeds LFB Bad V_DrawMemPatch (flags=%u)", | 436 | I_Error("V_DrawMemPatch: Patch (%d,%d)-(%d,%d) exceeds LFB Bad V_DrawMemPatch (flags=%u)", |
435 | x, y, x+SHORT(patch->width), y+SHORT(patch->height), flags); | 437 | x, y, x+SHORT(patch->width), y+SHORT(patch->height), flags); |
438 | } | ||
436 | 439 | ||
437 | if (!(flags & VPT_STRETCH)) { | 440 | if (!(flags & VPT_STRETCH)) { |
438 | unsigned int col; | 441 | unsigned int col; |