From d8cb0e2c7551833bd936e73a659decfa784c88b2 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 22 Jan 2006 23:48:00 +0000 Subject: Allow changing of all menu graphic lumps via dehacked Subversion-branch: /trunk/chocolate-doom Subversion-revision: 328 --- src/m_menu.c | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'src/m_menu.c') diff --git a/src/m_menu.c b/src/m_menu.c index c61686c6..f4513796 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: m_menu.c 322 2006-01-22 21:22:35Z fraggle $ +// $Id: m_menu.c 328 2006-01-22 23:48:00Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,9 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.14 2006/01/22 23:48:00 fraggle +// Allow changing of all menu graphic lumps via dehacked +// // Revision 1.13 2006/01/22 21:22:35 fraggle // Dehacked string replacements for menu graphic lump names // @@ -75,7 +78,7 @@ //----------------------------------------------------------------------------- static const char -rcsid[] = "$Id: m_menu.c 322 2006-01-22 21:22:35Z fraggle $"; +rcsid[] = "$Id: m_menu.c 328 2006-01-22 23:48:00Z fraggle $"; #include #include @@ -589,7 +592,7 @@ void M_DrawLoad(void) { int i; - V_DrawPatchDirect (72,28,0,W_CacheLumpName("M_LOADG",PU_CACHE)); + V_DrawPatchDirect (72,28,0,W_CacheLumpName(DEH_String("M_LOADG"),PU_CACHE)); for (i = 0;i < load_end; i++) { M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i); @@ -606,15 +609,15 @@ void M_DrawSaveLoadBorder(int x,int y) { int i; - V_DrawPatchDirect (x-8,y+7,0,W_CacheLumpName("M_LSLEFT",PU_CACHE)); + V_DrawPatchDirect (x-8,y+7,0,W_CacheLumpName(DEH_String("M_LSLEFT"),PU_CACHE)); for (i = 0;i < 24;i++) { - V_DrawPatchDirect (x,y+7,0,W_CacheLumpName("M_LSCNTR",PU_CACHE)); + V_DrawPatchDirect (x,y+7,0,W_CacheLumpName(DEH_String("M_LSCNTR"),PU_CACHE)); x += 8; } - V_DrawPatchDirect (x,y+7,0,W_CacheLumpName("M_LSRGHT",PU_CACHE)); + V_DrawPatchDirect (x,y+7,0,W_CacheLumpName(DEH_String("M_LSRGHT"),PU_CACHE)); } @@ -655,7 +658,7 @@ void M_DrawSave(void) { int i; - V_DrawPatchDirect (72,28,0,W_CacheLumpName("M_SAVEG",PU_CACHE)); + V_DrawPatchDirect (72,28,0,W_CacheLumpName(DEH_String("M_SAVEG"),PU_CACHE)); for (i = 0;i < load_end; i++) { M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i); @@ -872,7 +875,7 @@ void M_DrawReadThis2(void) // void M_DrawSound(void) { - V_DrawPatchDirect (60,38,0,W_CacheLumpName("M_SVOL",PU_CACHE)); + V_DrawPatchDirect (60,38,0,W_CacheLumpName(DEH_String("M_SVOL"),PU_CACHE)); M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(sfx_vol+1), 16,snd_SfxVolume); @@ -928,7 +931,7 @@ void M_MusicVol(int choice) // void M_DrawMainMenu(void) { - V_DrawPatchDirect (94,2,0,W_CacheLumpName("M_DOOM",PU_CACHE)); + V_DrawPatchDirect (94,2,0,W_CacheLumpName(DEH_String("M_DOOM"),PU_CACHE)); } @@ -939,8 +942,8 @@ void M_DrawMainMenu(void) // void M_DrawNewGame(void) { - V_DrawPatchDirect (96,14,0,W_CacheLumpName("M_NEWG",PU_CACHE)); - V_DrawPatchDirect (54,38,0,W_CacheLumpName("M_SKILL",PU_CACHE)); + V_DrawPatchDirect (96,14,0,W_CacheLumpName(DEH_String("M_NEWG"),PU_CACHE)); + V_DrawPatchDirect (54,38,0,W_CacheLumpName(DEH_String("M_SKILL"),PU_CACHE)); } void M_NewGame(int choice) @@ -965,7 +968,7 @@ int epi; void M_DrawEpisode(void) { - V_DrawPatchDirect (54,38,0,W_CacheLumpName("M_EPISOD",PU_CACHE)); + V_DrawPatchDirect (54,38,0,W_CacheLumpName(DEH_String("M_EPISOD"),PU_CACHE)); } void M_VerifyNightmare(int ch) @@ -1023,13 +1026,15 @@ char msgNames[2][9] = {"M_MSGOFF","M_MSGON"}; void M_DrawOptions(void) { - V_DrawPatchDirect (108,15,0,W_CacheLumpName("M_OPTTTL",PU_CACHE)); + V_DrawPatchDirect (108,15,0,W_CacheLumpName(DEH_String("M_OPTTTL"),PU_CACHE)); V_DrawPatchDirect (OptionsDef.x + 175,OptionsDef.y+LINEHEIGHT*detail,0, - W_CacheLumpName(detailNames[detailLevel],PU_CACHE)); + W_CacheLumpName(DEH_String(detailNames[detailLevel]), + PU_CACHE)); V_DrawPatchDirect (OptionsDef.x + 120,OptionsDef.y+LINEHEIGHT*messages,0, - W_CacheLumpName(msgNames[showMessages],PU_CACHE)); + W_CacheLumpName(DEH_String(msgNames[showMessages]), + PU_CACHE)); M_DrawThermo(OptionsDef.x,OptionsDef.y+LINEHEIGHT*(mousesens+1), 10,mouseSensitivity); @@ -1286,17 +1291,17 @@ M_DrawThermo int i; xx = x; - V_DrawPatchDirect (xx,y,0,W_CacheLumpName("M_THERML",PU_CACHE)); + V_DrawPatchDirect (xx,y,0,W_CacheLumpName(DEH_String("M_THERML"),PU_CACHE)); xx += 8; for (i=0;ix - 10, menu->y+item*LINEHEIGHT - 1, 0, - W_CacheLumpName("M_CELL1",PU_CACHE)); + W_CacheLumpName(DEH_String("M_CELL1"),PU_CACHE)); } void @@ -1316,7 +1321,7 @@ M_DrawSelCell int item ) { V_DrawPatchDirect (menu->x - 10, menu->y+item*LINEHEIGHT - 1, 0, - W_CacheLumpName("M_CELL2",PU_CACHE)); + W_CacheLumpName(DEH_String("M_CELL2"),PU_CACHE)); } @@ -1904,7 +1909,8 @@ void M_Drawer (void) // DRAW SKULL V_DrawPatchDirect(x + SKULLXOFF,currentMenu->y - 5 + itemOn*LINEHEIGHT, 0, - W_CacheLumpName(skullName[whichSkull],PU_CACHE)); + W_CacheLumpName(DEH_String(skullName[whichSkull]), + PU_CACHE)); } -- cgit v1.2.3