remove all non-critical uses of the GOODTIMES macro

fabiangreffrath · Aug 10, 2020 · 0c52e4f · 0c52e4f
1 parent d74e2f5
commit 0c52e4f
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 575 deletions.
diff --git a/README.txt b/README.txt
@@ -132,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/version.h b/version.h
@@ -15,15 +15,14 @@
 //#define APOGEE_1_2
 
 /*
-    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 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_def.h b/wl_def.h
@@ -939,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;