Backport alexey-lysiuk/prboom-plus@3d08adc

hizzlekizzle · Aug 28, 2015 · 97611ee · 97611ee
1 parent 4ec77b4
commit 97611ee
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1 deletion.
diff --git a/src/d_deh.c b/src/d_deh.c
@@ -277,6 +277,7 @@ const char *s_HUSTR_29    = HUSTR_29;
 const char *s_HUSTR_30    = HUSTR_30;
 const char *s_HUSTR_31    = HUSTR_31;
 const char *s_HUSTR_32    = HUSTR_32;
+const char *s_HUSTR_33    = HUSTR_33;
 const char *s_PHUSTR_1    = PHUSTR_1;
 const char *s_PHUSTR_2    = PHUSTR_2;
 const char *s_PHUSTR_3    = PHUSTR_3;
@@ -617,6 +618,7 @@ static deh_strs deh_strlookup[] = { // not const any more, because of orig.
   {&s_HUSTR_30,"HUSTR_30"},
   {&s_HUSTR_31,"HUSTR_31"},
   {&s_HUSTR_32,"HUSTR_32"},
+  {&s_HUSTR_33,"HUSTR_33"},
   {&s_PHUSTR_1,"PHUSTR_1"},
   {&s_PHUSTR_2,"PHUSTR_2"},
   {&s_PHUSTR_3,"PHUSTR_3"},
@@ -882,6 +884,7 @@ const char **const mapnames2[] = // DOOM 2 map names.
   &s_HUSTR_30,
   &s_HUSTR_31,
   &s_HUSTR_32,
+  &s_HUSTR_33,
 };
 
 // CPhipps - const**const

diff --git a/src/d_deh.h b/src/d_deh.h
@@ -410,6 +410,7 @@ extern const char *s_HUSTR_30; // = HUSTR_30;
 extern const char *s_HUSTR_31; // = HUSTR_31;
 //#define HUSTR_32      "level 32: grosse"
 extern const char *s_HUSTR_32; // = HUSTR_32;
+extern const char *s_HUSTR_33;
 
 //#define PHUSTR_1      "level 1: congo"
 extern const char *s_PHUSTR_1; // = PHUSTR_1;

diff --git a/src/d_englsh.h b/src/d_englsh.h
@@ -222,6 +222,7 @@
 
 #define HUSTR_31    "level 31: wolfenstein"
 #define HUSTR_32    "level 32: grosse"
+#define HUSTR_33    "level 33: betray"
 
 #define PHUSTR_1    "level 1: congo"
 #define PHUSTR_2    "level 2: well of souls"

diff --git a/src/d_main.c b/src/d_main.c
@@ -323,6 +323,7 @@ void I_SafeExit(int rc)
 static int  demosequence;         // killough 5/2/98: made static
 static int  pagetic;
 static const char *pagename; // CPhipps - const
+boolean bfgedition = 0;
 
 //
 // D_PageTicker

diff --git a/src/doomdef.h b/src/doomdef.h
@@ -61,6 +61,9 @@
 
 #include "m_swap.h"
 #include "version.h"
+#include "doomtype.h"
+
+extern boolean bfgedition;
 
 // Game mode handling - identify IWAD version
 //  to handle IWAD dependend animations etc.

diff --git a/src/g_game.c b/src/g_game.c
@@ -1243,13 +1243,19 @@ void G_DoCompleted (void)
             wminfo.next = 30; break;
           case 31:
             wminfo.next = 31; break;
+          case 2:
+            if (bfgedition)
+               wminfo.next = 32;
+            break;
           }
       else
         switch(gamemap)
           {
           case 31:
           case 32:
             wminfo.next = 15; break;
+          case 33:
+            wminfo.next = 2; break;
           default:
             wminfo.next = gamemap;
           }

diff --git a/src/m_cheat.c b/src/m_cheat.c
@@ -430,9 +430,12 @@ static void cheat_clev(char buf[3])
       (gamemode == retail     && (epsd > 4 || map > 9  )) ||
       (gamemode == registered && (epsd > 3 || map > 9  )) ||
       (gamemode == shareware  && (epsd > 1 || map > 9  )) ||
-      (gamemode == commercial && (epsd > 1 || map > 32 )) )  //jff no 33 and 34
+      (gamemode == commercial && (epsd > 1 || map > 33 )) )  //jff no 33 and 34
     return;                                                  //8/14/98 allowed
 
+  if (!bfgedition && map == 33)
+    return;
+
   // So be it.
 
   idmusnum = -1; //jff 3/17/98 revert to normal level music on IDCLEV