summaryrefslogtreecommitdiff
path: root/apps/plugins/doom/v_video.c
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2006-04-02 01:52:44 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2006-04-02 01:52:44 +0000
commit51db2d3f2cfddfb1c94de1085d130c817bcd953f (patch)
treea8452577070b7febf0ec640d2a065cd7e2c89847 /apps/plugins/doom/v_video.c
parente61b079c26e5eaa12f403da6964ac20282df248e (diff)
downloadrockbox-51db2d3f2cfddfb1c94de1085d130c817bcd953f.tar.gz
rockbox-51db2d3f2cfddfb1c94de1085d130c817bcd953f.zip
Update adds prboom's high resolution support, also makes the scaling for platforms w/ resolution less then 320x200 much nicer. IDoom's lookup table code has been removed. Also fixed a pallete bug. Some graphic errors are present in menu and status bar. Also updates some headers and output formatting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9418 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom/v_video.c')
-rw-r--r--apps/plugins/doom/v_video.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/apps/plugins/doom/v_video.c b/apps/plugins/doom/v_video.c
index a7dbe84d6a..75ccc3ffda 100644
--- a/apps/plugins/doom/v_video.c
+++ b/apps/plugins/doom/v_video.c
@@ -44,7 +44,7 @@
44#include "m_swap.h" 44#include "m_swap.h"
45#include "rockmacros.h" 45#include "rockmacros.h"
46// Each screen is [SCREENWIDTH*SCREENHEIGHT]; 46// Each screen is [SCREENWIDTH*SCREENHEIGHT];
47byte *screens[6]; 47byte *screens[6] IBSS_ATTR;
48int dirtybox[4]; 48int dirtybox[4];
49 49
50/* jff 4/24/98 initialize this at runtime */ 50/* jff 4/24/98 initialize this at runtime */
@@ -428,22 +428,22 @@ void V_DrawMemPatch(int x, int y, int scrn, const patch_t *patch,
428 y -= SHORT(patch->topoffset); 428 y -= SHORT(patch->topoffset);
429 x -= SHORT(patch->leftoffset); 429 x -= SHORT(patch->leftoffset);
430 430
431 // CPhipps - auto-no-stretch if not high-res 431// // CPhipps - auto-no-stretch if not high-res
432 if (flags & VPT_STRETCH) 432// if (flags & VPT_STRETCH)
433 if ((SCREENWIDTH==320) && (SCREENHEIGHT==200)) 433// if ((SCREENWIDTH==320) && (SCREENHEIGHT==200))
434 flags &= ~VPT_STRETCH; 434// flags &= ~VPT_STRETCH;
435 435
436 // CPhipps - null translation pointer => no translation 436 // CPhipps - null translation pointer => no translation
437 if (!trans) 437 if (!trans)
438 flags &= ~VPT_TRANS; 438 flags &= ~VPT_TRANS;
439 439
440 if (x<0 440// if (x<0
441 ||x+SHORT(patch->width) > ((flags & VPT_STRETCH) ? 320 : SCREENWIDTH) 441// ||x+SHORT(patch->width) > ((flags & VPT_STRETCH) ? 320 : SCREENWIDTH)
442 || y<0 442// || y<0
443 || y+SHORT(patch->height) > ((flags & VPT_STRETCH) ? 200 : SCREENHEIGHT)) 443// || y+SHORT(patch->height) > ((flags & VPT_STRETCH) ? 200 : SCREENHEIGHT))
444 // killough 1/19/98: improved error message: 444// // killough 1/19/98: improved error message:
445 I_Error("V_DrawMemPatch: Patch (%d,%d)-(%d,%d) exceeds LFB" 445// I_Error("V_DrawMemPatch: Patch (%d,%d)-(%d,%d) exceeds LFB"
446 "Bad V_DrawMemPatch (flags=%u)", x, y, x+SHORT(patch->width), y+SHORT(patch->height), flags); 446// "Bad V_DrawMemPatch (flags=%u)", x, y, x+SHORT(patch->width), y+SHORT(patch->height), flags);
447 447
448 if (!(flags & VPT_STRETCH)) { 448 if (!(flags & VPT_STRETCH)) {
449 unsigned int col; 449 unsigned int col;