From 129406f17da942e2613490cdad1c2b24591d50f6 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 22 Sep 2006 20:32:00 +0000
Subject: Add DEH_String() conversions on more strings that are not being
 converted.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 653
---
 src/m_menu.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/m_menu.c')

diff --git a/src/m_menu.c b/src/m_menu.c
index 73f8ce21..a4d8cbdf 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_menu.c 641 2006-09-21 11:13:28Z rtc_marine $
+// $Id: m_menu.c 653 2006-09-22 20:32:00Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -78,7 +78,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: m_menu.c 641 2006-09-21 11:13:28Z rtc_marine $";
+rcsid[] = "$Id: m_menu.c 653 2006-09-22 20:32:00Z fraggle $";
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -867,7 +867,7 @@ void M_DrawReadThis2(void)
     // We only ever draw the second page if this is 
     // gameversion == exe_doom_1_9 and gamemode == registered
 
-    V_DrawPatchDirect(0, 0, 0, W_CacheLumpName("HELP1", PU_CACHE));
+    V_DrawPatchDirect(0, 0, 0, W_CacheLumpName(DEH_String("HELP1"), PU_CACHE));
 }
 
 
@@ -1701,7 +1701,7 @@ boolean M_Responder (event_t* ev)
 	    if (usegamma > 4)
 		usegamma = 0;
 	    players[consoleplayer].message = DEH_String(gammamsg[usegamma]);
-            I_SetPalette (W_CacheLumpName ("PLAYPAL",PU_CACHE));
+            I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
 	    return true;
 				
 	}
@@ -1846,6 +1846,7 @@ void M_Drawer (void)
     short		i;
     short		max;
     char		string[40];
+    char               *name;
     int			start;
 
     inhelpscreens = false;
@@ -1896,13 +1897,11 @@ void M_Drawer (void)
 
     for (i=0;i<max;i++)
     {
-	if (currentMenu->menuitems[i].name[0])
-	{
-	    char *lumpname;
-
-	    lumpname = DEH_String(currentMenu->menuitems[i].name);
+        name = DEH_String(currentMenu->menuitems[i].name);
 
-	    V_DrawPatchDirect (x,y,0, W_CacheLumpName(lumpname, PU_CACHE));
+	if (name[0])
+	{
+	    V_DrawPatchDirect (x,y,0, W_CacheLumpName(name, PU_CACHE));
 	}
 	y += LINEHEIGHT;
     }
-- 
cgit v1.2.3