diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-03 00:28:13 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-03 00:28:13 +0000 |
commit | 9dde7b272ef9402e6a23b0aa5a88bdcc83be9df6 (patch) | |
tree | ba05635cd1af75a702764509343fc5631ef76d04 /apps/plugins/doom | |
parent | c16c727e5426406305b23039f49c2a4ae01562b0 (diff) | |
download | rockbox-9dde7b272ef9402e6a23b0aa5a88bdcc83be9df6.tar.gz rockbox-9dde7b272ef9402e6a23b0aa5a88bdcc83be9df6.zip |
Fixes graphic errors in scaling code, note sure about the fix in hu_lib.c though. I havn't seen any corrupted text but it may still need a proper fix.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9445 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom')
-rw-r--r-- | apps/plugins/doom/hu_lib.c | 6 | ||||
-rw-r--r-- | apps/plugins/doom/m_menu.c | 7 | ||||
-rw-r--r-- | apps/plugins/doom/r_draw.c | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/apps/plugins/doom/hu_lib.c b/apps/plugins/doom/hu_lib.c index 2ac3d35dde..3c510b028c 100644 --- a/apps/plugins/doom/hu_lib.c +++ b/apps/plugins/doom/hu_lib.c | |||
@@ -219,6 +219,10 @@ void HUlib_drawTextLine | |||
219 | // | 219 | // |
220 | void HUlib_eraseTextLine(hu_textline_t* l) | 220 | void HUlib_eraseTextLine(hu_textline_t* l) |
221 | { | 221 | { |
222 | // KK - If someone finds a use for this code, please fix it, I havn't seen the need | ||
223 | // And it's not written to take into account scaling. Causing some nasty effects | ||
224 | // on smaller screens. | ||
225 | #if 0 | ||
222 | int lh; | 226 | int lh; |
223 | int y; | 227 | int y; |
224 | int yoffset; | 228 | int yoffset; |
@@ -243,8 +247,8 @@ void HUlib_eraseTextLine(hu_textline_t* l) | |||
243 | } | 247 | } |
244 | } | 248 | } |
245 | } | 249 | } |
246 | |||
247 | if (l->needsupdate) l->needsupdate--; | 250 | if (l->needsupdate) l->needsupdate--; |
251 | #endif | ||
248 | } | 252 | } |
249 | 253 | ||
250 | //////////////////////////////////////////////////////// | 254 | //////////////////////////////////////////////////////// |
diff --git a/apps/plugins/doom/m_menu.c b/apps/plugins/doom/m_menu.c index 34f3e22ce2..d84717b642 100644 --- a/apps/plugins/doom/m_menu.c +++ b/apps/plugins/doom/m_menu.c | |||
@@ -16,7 +16,10 @@ | |||
16 | // GNU General Public License for more details. | 16 | // GNU General Public License for more details. |
17 | // | 17 | // |
18 | // $Log$ | 18 | // $Log$ |
19 | // Revision 1.1 2006/03/28 15:44:01 dave | 19 | // Revision 1.2 2006/04/03 00:28:13 kkurbjun |
20 | // Fixes graphic errors in scaling code, note sure about the fix in hu_lib.c though. I havn't seen any corrupted text but it may still need a proper fix. | ||
21 | // | ||
22 | // Revision 1.1 2006-03-28 15:44:01 dave | ||
20 | // Patch #2969 - Doom! Currently only working on the H300. | 23 | // Patch #2969 - Doom! Currently only working on the H300. |
21 | // | 24 | // |
22 | // | 25 | // |
@@ -1326,7 +1329,7 @@ M_WriteText | |||
1326 | } | 1329 | } |
1327 | 1330 | ||
1328 | w = SHORT (hu_font[c].width); | 1331 | w = SHORT (hu_font[c].width); |
1329 | if (cx+w > SCREENWIDTH) | 1332 | if (cx+w > 320) |
1330 | break; | 1333 | break; |
1331 | // proff/nicolas 09/20/98 -- changed for hi-res | 1334 | // proff/nicolas 09/20/98 -- changed for hi-res |
1332 | // CPhipps - patch drawing updated | 1335 | // CPhipps - patch drawing updated |
diff --git a/apps/plugins/doom/r_draw.c b/apps/plugins/doom/r_draw.c index f0b9d3300b..b6d84f0dff 100644 --- a/apps/plugins/doom/r_draw.c +++ b/apps/plugins/doom/r_draw.c | |||
@@ -630,7 +630,6 @@ void R_VideoErase(unsigned ofs, int count) | |||
630 | memcpy(screens[0]+ofs, screens[1]+ofs, count); // LFB copy. | 630 | memcpy(screens[0]+ofs, screens[1]+ofs, count); // LFB copy. |
631 | } | 631 | } |
632 | 632 | ||
633 | |||
634 | // | 633 | // |
635 | // R_DrawViewBorder | 634 | // R_DrawViewBorder |
636 | // Draws the border around the view | 635 | // Draws the border around the view |
@@ -668,7 +667,7 @@ void R_DrawViewBorder(void) | |||
668 | } | 667 | } |
669 | 668 | ||
670 | if ( viewheight >= ( SCREENHEIGHT - ST_SCALED_HEIGHT )) | 669 | if ( viewheight >= ( SCREENHEIGHT - ST_SCALED_HEIGHT )) |
671 | return; // if high-res, donŽt go any further! | 670 | return; // if high-res, don't go any further! |
672 | 671 | ||
673 | top = ((SCREENHEIGHT-ST_SCALED_HEIGHT)-viewheight)/2; | 672 | top = ((SCREENHEIGHT-ST_SCALED_HEIGHT)-viewheight)/2; |
674 | side = (SCREENWIDTH-scaledviewwidth)/2; | 673 | side = (SCREENWIDTH-scaledviewwidth)/2; |