Console|libcommon: Read-only variable "map-episode" is now a string

skyjake · Aug 11, 2014 · c701f95 · c701f95
1 parent 0bef1b1
commit c701f95
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/doomsday/doc/libcommon/variable/map-episode.ame b/doomsday/doc/libcommon/variable/map-episode.ame
@@ -1,3 +1,3 @@
 @summary{
-    Current episode.
+    Current episode id.
 }
diff --git a/doomsday/doc/libdoom/variable/map-mission.ame b/doomsday/doc/libdoom/variable/map-mission.ame
diff --git a/doomsday/plugins/common/src/gamesession.cpp b/doomsday/plugins/common/src/gamesession.cpp
@@ -483,8 +483,8 @@ DENG2_PIMPL(GameSession), public SavedSession::IMapStateReaderFactory
         ::gameMapUri = mapUri;
 
         // Update game status cvars:
-        Con_SetInteger2("map-episode", episodeId.toInt() - 1, SVF_WRITE_OVERRIDE);
-        Con_SetUri2    ("map-id",      reinterpret_cast<uri_s *>(&::gameMapUri), SVF_WRITE_OVERRIDE);
+        Con_SetString2("map-episode", episodeId.toUtf8().constData(), SVF_WRITE_OVERRIDE);
+        Con_SetUri2   ("map-id",      reinterpret_cast<uri_s *>(&::gameMapUri), SVF_WRITE_OVERRIDE);
     }
 
     /**
@@ -1280,8 +1280,8 @@ String GameSession::savedUserDescription(String const &saveName)
 
 namespace {
 int gsvRuleSkill;
-int gsvEpisode;
-uri_s *gsvMap;
+char *gsvEpisode = (char *)"";
+//uri_s *gsvMap;
 #if __JHEXEN__
 int gsvHub;
 #endif
@@ -1291,12 +1291,12 @@ void GameSession::consoleRegister() //static
 {
 #define READONLYCVAR  (CVF_READ_ONLY | CVF_NO_MAX | CVF_NO_MIN | CVF_NO_ARCHIVE)
 
-    C_VAR_INT("game-skill",  &gsvRuleSkill, READONLYCVAR, 0, 0);
-    C_VAR_INT("map-episode", &gsvEpisode,   READONLYCVAR, 0, 0);
+    C_VAR_INT    ("game-skill",     &gsvRuleSkill,  READONLYCVAR, 0, 0);
+    C_VAR_CHARPTR("map-episode",    &gsvEpisode,    READONLYCVAR, 0, 0);
 #if __JHEXEN__
-    C_VAR_INT("map-hub",     &gsvHub,       READONLYCVAR, 0, 0);
+    //C_VAR_INT    ("map-hub",        &gsvHub,        READONLYCVAR, 0, 0);
 #endif
-    C_VAR_URIPTR("map-id",   &gsvMap,       READONLYCVAR, 0, 0);
+    C_VAR_URIPTR ("map-id",         &gsvMap,        READONLYCVAR, 0, 0);
 
 #undef READONLYCVAR
 }

diff --git a/doomsday/plugins/doom/data/conhelp.txt b/doomsday/plugins/doom/data/conhelp.txt
@@ -410,7 +410,7 @@ desc = 1=Show door colors in automap.
 desc = Door glow thickness in the automap (with map-door-colors).
 
 [map-episode]
-desc = Current episode.
+desc = Current episode id.
 
 [map-huddisplay]
 desc = 0=No HUD when in the automap 1=Current HUD display shown when in the automap 2=Always show Status Bar when in the automap
@@ -811,9 +811,6 @@ desc = 1=Show keys in HUD.
 [hud-status-weaponslots-ownedfix]
 desc = 1=Fix original DOOM behavior when drawing the statusbar owned weapon display.
 
-[map-mission]
-desc = Current mission.
-
 [menu-quitsound]
 desc = 1=Play a sound when quitting the game.
 

diff --git a/doomsday/plugins/doom64/data/conhelp.txt b/doomsday/plugins/doom64/data/conhelp.txt
@@ -345,10 +345,7 @@ desc = Current map id.
 desc = Current map name.
 
 [map-episode]
-desc = Current episode.
-
-[map-mission]
-desc = Current mission.
+desc = Current episode id.
 
 [game-music]
 desc = Currently playing music (id).

diff --git a/doomsday/plugins/heretic/data/conhelp.txt b/doomsday/plugins/heretic/data/conhelp.txt
@@ -413,7 +413,7 @@ desc = 1=Show door colors in automap.
 desc = Door glow thickness in the automap (with map-door-colors).
 
 [map-episode]
-desc = Current episode.
+desc = Current episode id.
 
 [map-huddisplay]
 desc = 0=No HUD when in the automap 1=Current HUD display shown when in the automap 2=Always show Status Bar when in the automap

diff --git a/doomsday/plugins/hexen/data/conhelp.txt b/doomsday/plugins/hexen/data/conhelp.txt
@@ -426,7 +426,7 @@ desc = 1=Show door colors in automap.
 desc = Door glow thickness in the automap (with map-door-colors).
 
 [map-episode]
-desc = Current episode.
+desc = Current episode id.
 
 [map-huddisplay]
 desc = 0=No HUD when in the automap 1=Current HUD display shown when in the automap 2=Always show Status Bar when in the automap