[chocolate-doom] 05/26: Dehacked string replacements for menu graphic lump names

[Jonathan Dowland]

This is an automated email from the git hooks/post-receive script.

jmtd pushed a commit to annotated tag chocolate-doom-0.1.4
in repository chocolate-doom.

commit 8c9132829e9e48044212fe7755c4ceffd86c418c
Author: Simon Howard <fraggle at gmail.com>
Date:   Sun Jan 22 21:21:57 2006 +0000

    Dehacked string replacements for menu graphic lump names
    
    Subversion-branch: /branches/CHOCOLATE_DOOM_0_1/chocolate-doom
    Subversion-revision: 321
---
 src/m_menu.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index 612bb48..fd188fb 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: m_menu.c 225 2005-10-29 21:38:55Z fraggle $
+// $Id: m_menu.c 321 2006-01-22 21:21:57Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.11.2.1  2006/01/22 21:21:57  fraggle
+// Dehacked string replacements for menu graphic lump names
+//
 // Revision 1.11  2005/10/29 21:38:55  fraggle
 // Fix help screen orderings and skull positions to make Chocolate Doom
 // behave exactly like the original executables.
@@ -69,7 +72,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: m_menu.c 225 2005-10-29 21:38:55Z fraggle $";
+rcsid[] = "$Id: m_menu.c 321 2006-01-22 21:21:57Z fraggle $";
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -838,6 +841,8 @@ void M_DrawReadThis1(void)
 
             break;
     }
+
+    lumpname = DEH_String(lumpname);
     
     V_DrawPatchDirect (0, 0, 0, W_CacheLumpName(lumpname, PU_CACHE));
 
@@ -1885,8 +1890,13 @@ void M_Drawer (void)
     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;
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git