From b10d4acc24278460fc357aa974d7e3e56f0d5953 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Wed, 1 Sep 2010 02:25:31 +0000
Subject: Handle green palette flash powered by player->nukagecount, and added
 Strife mapnames.

Subversion-branch: /branches/strife-branch
Subversion-revision: 1991
---
 src/strife/hu_stuff.c | 186 ++++++--------------------------------------------
 1 file changed, 19 insertions(+), 167 deletions(-)

(limited to 'src/strife/hu_stuff.c')

diff --git a/src/strife/hu_stuff.c b/src/strife/hu_stuff.c
index 395a64bd..926cb760 100644
--- a/src/strife/hu_stuff.c
+++ b/src/strife/hu_stuff.c
@@ -51,11 +51,7 @@
 //
 // Locally used constants, shortcuts.
 //
-#define HU_TITLE	(mapnames[(gameepisode-1)*9+gamemap-1])
-#define HU_TITLE2	(mapnames_commercial[gamemap-1])
-#define HU_TITLEP	(mapnames_commercial[gamemap-1 + 32])
-#define HU_TITLET	(mapnames_commercial[gamemap-1 + 64])
-#define HU_TITLE_CHEX   (mapnames[gamemap - 1])
+#define HU_TITLE	(mapnames[gamemap-1])
 #define HU_TITLEHEIGHT	1
 #define HU_TITLEX	0
 #define HU_TITLEY	(167 - SHORT(hu_font[0]->height))
@@ -117,70 +113,14 @@ static boolean		headsupactive = false;
 // The actual names can be found in DStrings.h.
 //
 
-char*	mapnames[] =	// DOOM shareware/registered/retail (Ultimate) names.
-{
-
-    HUSTR_E1M1,
-    HUSTR_E1M2,
-    HUSTR_E1M3,
-    HUSTR_E1M4,
-    HUSTR_E1M5,
-    HUSTR_E1M6,
-    HUSTR_E1M7,
-    HUSTR_E1M8,
-    HUSTR_E1M9,
-
-    HUSTR_E2M1,
-    HUSTR_E2M2,
-    HUSTR_E2M3,
-    HUSTR_E2M4,
-    HUSTR_E2M5,
-    HUSTR_E2M6,
-    HUSTR_E2M7,
-    HUSTR_E2M8,
-    HUSTR_E2M9,
-
-    HUSTR_E3M1,
-    HUSTR_E3M2,
-    HUSTR_E3M3,
-    HUSTR_E3M4,
-    HUSTR_E3M5,
-    HUSTR_E3M6,
-    HUSTR_E3M7,
-    HUSTR_E3M8,
-    HUSTR_E3M9,
-
-    HUSTR_E4M1,
-    HUSTR_E4M2,
-    HUSTR_E4M3,
-    HUSTR_E4M4,
-    HUSTR_E4M5,
-    HUSTR_E4M6,
-    HUSTR_E4M7,
-    HUSTR_E4M8,
-    HUSTR_E4M9,
-
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL",
-    "NEWLEVEL"
-};
-
-// List of names for levels in commercial IWADs
-// (doom2.wad, plutonia.wad, tnt.wad).  These are stored in a
-// single large array; WADs like pl2.wad have a MAP33, and rely on
-// the layout in the Vanilla executable, where it is possible to
-// overflow the end of one array into the next.
+// haleyjd 08/31/10: [STRIFE] Changed for Strife level names.
+// List of names for levels.
 
-char *mapnames_commercial[] =
+char *mapnames[] =
 {
-    // DOOM 2 map names.
+    // Strife map names
 
+    // First "episode" - Quest to destroy the Order's Castle
     HUSTR_1,
     HUSTR_2,
     HUSTR_3,
@@ -190,9 +130,10 @@ char *mapnames_commercial[] =
     HUSTR_7,
     HUSTR_8,
     HUSTR_9,
+
+    // Second "episode" - Kill the Bishop and Make a Choice
     HUSTR_10,
     HUSTR_11,
-	
     HUSTR_12,
     HUSTR_13,
     HUSTR_14,
@@ -201,8 +142,9 @@ char *mapnames_commercial[] =
     HUSTR_17,
     HUSTR_18,
     HUSTR_19,
+
+    // Third "episode" - Shut down Factory, kill Loremaster and Entity
     HUSTR_20,
-	
     HUSTR_21,
     HUSTR_22,
     HUSTR_23,
@@ -212,83 +154,15 @@ char *mapnames_commercial[] =
     HUSTR_27,
     HUSTR_28,
     HUSTR_29,
+
+    // "Secret" levels - Abandoned Base and Training Facility
     HUSTR_30,
     HUSTR_31,
-    HUSTR_32,
 
-    // Plutonia WAD map names.
-
-    PHUSTR_1,
-    PHUSTR_2,
-    PHUSTR_3,
-    PHUSTR_4,
-    PHUSTR_5,
-    PHUSTR_6,
-    PHUSTR_7,
-    PHUSTR_8,
-    PHUSTR_9,
-    PHUSTR_10,
-    PHUSTR_11,
-	
-    PHUSTR_12,
-    PHUSTR_13,
-    PHUSTR_14,
-    PHUSTR_15,
-    PHUSTR_16,
-    PHUSTR_17,
-    PHUSTR_18,
-    PHUSTR_19,
-    PHUSTR_20,
-	
-    PHUSTR_21,
-    PHUSTR_22,
-    PHUSTR_23,
-    PHUSTR_24,
-    PHUSTR_25,
-    PHUSTR_26,
-    PHUSTR_27,
-    PHUSTR_28,
-    PHUSTR_29,
-    PHUSTR_30,
-    PHUSTR_31,
-    PHUSTR_32,
-    
-    // TNT WAD map names.
-
-    THUSTR_1,
-    THUSTR_2,
-    THUSTR_3,
-    THUSTR_4,
-    THUSTR_5,
-    THUSTR_6,
-    THUSTR_7,
-    THUSTR_8,
-    THUSTR_9,
-    THUSTR_10,
-    THUSTR_11,
-	
-    THUSTR_12,
-    THUSTR_13,
-    THUSTR_14,
-    THUSTR_15,
-    THUSTR_16,
-    THUSTR_17,
-    THUSTR_18,
-    THUSTR_19,
-    THUSTR_20,
-	
-    THUSTR_21,
-    THUSTR_22,
-    THUSTR_23,
-    THUSTR_24,
-    THUSTR_25,
-    THUSTR_26,
-    THUSTR_27,
-    THUSTR_28,
-    THUSTR_29,
-    THUSTR_30,
-    THUSTR_31,
-    THUSTR_32
+    // Demo version maps
+    HUSTR_32,
+    HUSTR_33,
+    HUSTR_34
 };
 
 void HU_Init(void)
@@ -340,35 +214,13 @@ void HU_Start(void)
 		       hu_font,
 		       HU_FONTSTART);
     
-    switch ( gamemission )
-    {
-      case doom:
-	s = HU_TITLE;
-	break;
-      case doom2:
-	 s = HU_TITLE2;
-	 break;
-      case pack_plut:
-	s = HU_TITLEP;
-	break;
-      case pack_tnt:
-	s = HU_TITLET;
-	break;
-      default:
-         s = "Unknown level";
-         break;
-    }
 
-    // Chex.exe always uses the episode 1 level title
-    // eg. E2M1 gives the title for E1M1
+    // haleyjd 08/31/10: [STRIFE] Get proper map name.
+    s = HU_TITLE;
 
-    if (gameversion == exe_chex)
-    {
-        s = HU_TITLE_CHEX;
-    }
+    // [STRIFE] Removed Chex Quest stuff.
 
     // dehacked substitution to get modified level name
-
     s = DEH_String(s);
     
     while (*s)
-- 
cgit v1.2.3