From 7b1aff6c464f28e7d5f8b10fd33b15f5d15122a6 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Mon, 19 Sep 2011 00:15:06 +0000
Subject: The current Chocolate Strife code emulates v1.2, not 1.31. 1.31
 support is still a TODO and cannot be pursued without resolution of the
 keybinding issue for the menu system.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2386
---
 src/d_mode.c          |  2 +-
 src/d_mode.h          |  2 +-
 src/strife/d_main.c   | 11 ++++++-----
 src/strife/doomstat.c |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/d_mode.c b/src/d_mode.c
index 4832e01b..2d94d82f 100644
--- a/src/d_mode.c
+++ b/src/d_mode.c
@@ -132,7 +132,7 @@ static struct {
     { doom,     exe_final },
     { heretic,  exe_heretic_1_3 },
     { hexen,    exe_hexen_1_1 },
-    { strife,   exe_strife_1_31 },
+    { strife,   exe_strife_1_2 },
 };
 
 boolean D_ValidGameVersion(GameMission_t mission, GameVersion_t version)
diff --git a/src/d_mode.h b/src/d_mode.h
index c0d302dc..1f959d8d 100644
--- a/src/d_mode.h
+++ b/src/d_mode.h
@@ -72,7 +72,7 @@ typedef enum
     exe_heretic_1_3, // Heretic 1.3
 
     exe_hexen_1_1,   // Hexen 1.1
-    exe_strife_1_31, // Strife v1.31
+    exe_strife_1_2, // Strife v1.2
 } GameVersion_t;
 
 // Skill level.
diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 2eab0308..7170b5d1 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -759,7 +759,7 @@ static char *banners[] =
     // strife1.wad:
 
     "                      "
-    "STRIFE:  Quest for the Sigil v1.31"
+    "STRIFE:  Quest for the Sigil v1.2"
     "                                 "
 };
 
@@ -1012,7 +1012,7 @@ static struct
     char *cmdline;
     GameVersion_t version;
 } gameversions[] = {
-    {"Strife 1.31",          "1.31",       exe_strife_1_31},
+    {"Strife 1.2",          "1.2",       exe_strife_1_2},
     { NULL,                  NULL,         0},
 };
 
@@ -1024,14 +1024,15 @@ static void InitGameVersion(void)
     int i;
 
     // This is mostly redundant for now, as we only support
-    // Strife v1.31. But perhaps in the future we might decide
+    // Strife v1.2. But perhaps in the future we might decide
     // to support older versions ...
+    // - haleyjd: the current code emulates v1.2. 1.31 support is the TODO.
 
     //! 
     // @arg <version>
     // @category compat
     //
-    // Emulate a specific version of Doom.  Valid values are "1.31".
+    // Emulate a specific version of Doom.  Valid values are "1.2".
     //
 
     p = M_CheckParmWithArgs("-gameversion", 1);
@@ -1062,7 +1063,7 @@ static void InitGameVersion(void)
     }
     else
     {
-        gameversion = exe_strife_1_31;
+        gameversion = exe_strife_1_2;
     }
 }
 
diff --git a/src/strife/doomstat.c b/src/strife/doomstat.c
index df1c34ab..6bc552a7 100644
--- a/src/strife/doomstat.c
+++ b/src/strife/doomstat.c
@@ -32,7 +32,7 @@
 // Game Mode - identify IWAD as shareware, retail etc.
 GameMode_t gamemode = indetermined;
 GameMission_t	gamemission = doom;
-GameVersion_t   gameversion = exe_strife_1_31;
+GameVersion_t   gameversion = exe_strife_1_2;
 char *gamedescription;
 
 // Set if homebrew PWAD stuff has been added.
-- 
cgit v1.2.3