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

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
 //
 void HUlib_eraseTextLine(hu_textline_t* l)
 {
+// KK - If someone finds a use for this code, please fix it, I havn't seen the need
+//      And it's not written to take into account scaling.  Causing some nasty effects
+//      on smaller screens.
+#if 0
    int lh;
    int y;
    int yoffset;
@@ -243,8 +247,8 @@ void HUlib_eraseTextLine(hu_textline_t* l)
          }
       }
    }
-
    if (l->needsupdate) l->needsupdate--;
+#endif
 }
 
 ////////////////////////////////////////////////////////
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 @@
 // GNU General Public License for more details.
 //
 // $Log$
-// Revision 1.1  2006/03/28 15:44:01  dave
+// Revision 1.2  2006/04/03 00:28:13  kkurbjun
+// 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.
+//
+// Revision 1.1  2006-03-28 15:44:01  dave
 // Patch #2969 - Doom!  Currently only working on the H300.
 //
 //
@@ -1326,7 +1329,7 @@ M_WriteText
       }
 
       w = SHORT (hu_font[c].width);
-      if (cx+w > SCREENWIDTH)
+      if (cx+w > 320)
          break;
       // proff/nicolas 09/20/98 -- changed for hi-res
       // 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)
    memcpy(screens[0]+ofs, screens[1]+ofs, count);   // LFB copy.
 }
 
-
 //
 // R_DrawViewBorder
 // Draws the border around the view
@@ -668,7 +667,7 @@ void R_DrawViewBorder(void)
    }
 
    if ( viewheight >= ( SCREENHEIGHT - ST_SCALED_HEIGHT ))
-      return; // if high-res, donŽt go any further!
+      return; // if high-res, don't go any further!
 
    top = ((SCREENHEIGHT-ST_SCALED_HEIGHT)-viewheight)/2;
    side = (SCREENWIDTH-scaledviewwidth)/2;