Merge pull request #30 from fabiangreffrath/unl10n

remove one unnecessary define remove Spanish l10n remove Japanese i18n remove all non-critical uses of the GOODTIMES macro
fabiangreffrath · Aug 10, 2020 · 7ee9a2d · 7ee9a2d
2 parents 63776e1 + 0c52e4f
commit 7ee9a2d
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 1,430 deletions.
diff --git a/README.txt b/README.txt
@@ -80,7 +80,6 @@ version.h as described in that file):
  - Wolfenstein 3D v1.1 full Apogee
  - Wolfenstein 3D v1.4 full Apogee
  - Wolfenstein 3D v1.4 full GT/ID/Activision
- - Wolfenstein 3D v1.4 full Imagineer (Japanese)
  - Wolfenstein 3D v1.0 shareware Apogee
  - Wolfenstein 3D v1.1 shareware Apogee
  - Wolfenstein 3D v1.2 shareware Apogee
@@ -133,7 +132,6 @@ Wolf4SDL supports the following command line options:
 
 For Spear of Destiny the following additional options are available:
  --mission <mission>    Mission number to play (1-3)
- --goodtimes            Disable copy protection quiz
 
 
 Compiling from source code:

diff --git a/gfxv_jap.h b/gfxv_jap.h
diff --git a/version.h b/version.h
@@ -13,19 +13,16 @@
 //#define APOGEE_1_0
 //#define APOGEE_1_1
 //#define APOGEE_1_2
-//#define JAPAN
 
 /*
-    Wolf3d Full v1.1 Apogee (with ReadThis)   - define CARMACIZED and APOGEE_1_1
-    Wolf3d Full v1.4 Apogee (with ReadThis)   - define CARMACIZED
+    Wolf3d Full v1.1 Apogee                   - define CARMACIZED and APOGEE_1_1
+    Wolf3d Full v1.4 Apogee                   - define CARMACIZED
     Wolf3d Full v1.4 GT/ID/Activision         - define CARMACIZED and GOODTIMES
-    Wolf3d Full v1.4 Imagineer (Japanese)     - define CARMACIZED and JAPAN
     Wolf3d Shareware v1.0                     - define UPLOAD and APOGEE_1_0
     Wolf3d Shareware v1.1                     - define CARMACIZED and UPLOAD and APOGEE_1_1
     Wolf3d Shareware v1.2                     - define CARMACIZED and UPLOAD and APOGEE_1_2
     Wolf3d Shareware v1.4                     - define CARMACIZED and UPLOAD
     Spear of Destiny Full and Mission Disks   - define CARMACIZED and SPEAR
-                                                (and GOODTIMES for no FormGen quiz)
     Spear of Destiny Demo                     - define CARMACIZED and SPEAR and SPEARDEMO
 */
 

diff --git a/wl_act2.cpp b/wl_act2.cpp
@@ -2582,13 +2582,7 @@ void    A_StartDeathCam (objtype *ob)
     else
     {
         CacheLump(LEVELEND_LUMP_START,LEVELEND_LUMP_END);
-#ifdef JAPAN
-#ifndef JAPDEMO
-        CA_CacheScreen(C_LETSSEEPIC);
-#endif
-#else
         Write(0,7,STR_SEEAGAIN);
-#endif
     }
 
     VW_UpdateScreen ();

diff --git a/wl_def.h b/wl_def.h
@@ -52,15 +52,11 @@
     #ifdef UPLOAD
         #include "gfxv_apo.h"
     #else
-		#ifdef JAPAN
-			#include "gfxv_jap.h"
-		#else
 			#ifdef GOODTIMES
 	            #include "gfxv_wl6.h"
 		    #else
 			    #include "gfxv_apo.h"
 			#endif
-        #endif
     #endif
 #else
     #include "audiosod.h"
@@ -943,7 +939,6 @@ extern  int      param_joystickhat;
 extern  longword param_samplerate;
 extern  int      param_audiobuffer;
 extern  int      param_mission;
-extern  boolean  param_goodtimes;
 extern  boolean  param_ignorenumchunks;
 
 

diff --git a/wl_game.cpp b/wl_game.cpp
@@ -1479,27 +1479,7 @@ void GameLoop (void)
                     ClearMemory ();
 
                     CheckHighScore (gamestate.score,gamestate.mapon+1);
-#ifndef JAPAN
                     strcpy(MainMenu[viewscores].string,STR_VS);
-#endif
-                    MainMenu[viewscores].routine = CP_ViewScores;
-                    return;
-                }
-#endif
-
-#ifdef JAPDEMO
-                if (gamestate.mapon == 3)
-                {
-                    died = true;                    // don't "get psyched!"
-
-                    VW_FadeOut ();
-
-                    ClearMemory ();
-
-                    CheckHighScore (gamestate.score,gamestate.mapon+1);
-#ifndef JAPAN
-                    strcpy(MainMenu[viewscores].string,STR_VS);
-#endif
                     MainMenu[viewscores].routine = CP_ViewScores;
                     return;
                 }
@@ -1565,9 +1545,7 @@ void GameLoop (void)
                 ClearMemory ();
 
                 CheckHighScore (gamestate.score,gamestate.mapon+1);
-#ifndef JAPAN
                 strcpy(MainMenu[viewscores].string,STR_VS);
-#endif
                 MainMenu[viewscores].routine = CP_ViewScores;
                 return;
 
@@ -1585,9 +1563,7 @@ void GameLoop (void)
                 ClearMemory ();
 
                 CheckHighScore (gamestate.score,gamestate.mapon+1);
-#ifndef JAPAN
                 strcpy(MainMenu[viewscores].string,STR_VS);
-#endif
                 MainMenu[viewscores].routine = CP_ViewScores;
                 return;