shithub: choc

Download patch

ref: e66fffd3202fe22a2eefbb4a3cb6a73048890de5
parent: eaa855df0b7739e7e86ee60fa01759ec98b913f8
author: Simon Howard <[email protected]>
date: Sun Jan 22 16:22:35 EST 2006 

Dehacked string replacements for menu graphic lump names

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 322


--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_menu.c 311 2006-01-21 14:15:29Z fraggle $
+// $Id: m_menu.c 322 2006-01-22 21:22:35Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.13  2006/01/22 21:22:35  fraggle
+// Dehacked string replacements for menu graphic lump names
+//
 // Revision 1.12  2006/01/21 14:15:29  fraggle
 // Remove SAVESTRINGSIZE (now defined in p_saveg.h)
 //
@@ -72,7 +75,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: m_menu.c 311 2006-01-21 14:15:29Z fraggle $";
+rcsid[] = "$Id: m_menu.c 322 2006-01-22 21:22:35Z fraggle $";
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -839,6 +842,8 @@
 
             break;
     }
+
+    lumpname = DEH_String(lumpname);
     
     V_DrawPatchDirect (0, 0, 0, W_CacheLumpName(lumpname, PU_CACHE));
 
@@ -1886,8 +1891,13 @@
     for (i=0;i<max;i++)
     {
 	if (currentMenu->menuitems[i].name[0])
-	    V_DrawPatchDirect (x,y,0,
-			       W_CacheLumpName(currentMenu->menuitems[i].name ,PU_CACHE));
+	{
+	    char *lumpname;
+
+	    lumpname = DEH_String(currentMenu->menuitems[i].name);
+
+	    V_DrawPatchDirect (x,y,0, W_CacheLumpName(lumpname, PU_CACHE));
+	}
 	y += LINEHEIGHT;
     }