Changed Hexen: It is now possible to -warp using the console if a gam…

…e has not yet been started. In this instance a new game is initiated using the default skill and player class.
skyjake · Mar 20, 2010 · 93e9749 · 93e9749
1 parent 7c3df87
commit 93e9749
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -162,6 +162,8 @@ game_config_t cfg; // The global cfg.
 
 int debugSound; // Debug flag for displaying sound info.
 
+skillmode_t dSkill;
+
 skillmode_t gameSkill;
 uint gameEpisode;
 uint gameMap;
@@ -397,7 +399,6 @@ ccmd_t gameCmds[] = {
 
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
-static skillmode_t dSkill;
 static uint dEpisode;
 static uint dMap;
 
@@ -1685,7 +1686,7 @@ void G_StartNewInit(void)
 void G_StartNewGame(skillmode_t skill)
 {
     G_StartNewInit();
-    G_InitNew(dSkill, 0, P_TranslateMap(0));
+    G_InitNew(skill, 0, P_TranslateMap(0));
 }
 #endif
 

diff --git a/doomsday/plugins/jhexen/include/g_game.h b/doomsday/plugins/jhexen/include/g_game.h
@@ -42,6 +42,8 @@ extern skillmode_t gameSkill;
 extern boolean deathmatch;
 extern boolean userGame;
 
+extern skillmode_t dSkill;
+
 extern uint rebornPosition;
 extern uint nextMap;
 extern uint nextMapEntryPoint;

diff --git a/doomsday/plugins/jhexen/src/m_cheat.c b/doomsday/plugins/jhexen/src/m_cheat.c
@@ -381,7 +381,7 @@ int Cht_WarpFunc(const int* args, int player)
     }
 
     map = P_TranslateMap((tens * 10 + ones) - 1);
-    if(map == gameMap)
+    if(userGame && map == gameMap)
     {   // Don't try to teleport to the current map.
         P_SetMessage(plr, TXT_CHEATBADINPUT, false);
         return false;
@@ -407,10 +407,19 @@ int Cht_WarpFunc(const int* args, int player)
             AM_Open(AM_MapForPlayer(i), false, true);
 
     // So be it.
-    nextMap = map;
-    nextMapEntryPoint = 0;
-    briefDisabled = true;
-    G_SetGameAction(GA_LEAVEMAP);
+    if(userGame)
+    {
+        nextMap = map;
+        nextMapEntryPoint = 0;
+        briefDisabled = true;
+        G_SetGameAction(GA_LEAVEMAP);
+    }
+    else
+    {
+        briefDisabled = true;
+        G_StartNewInit();
+        G_InitNew(dSkill, 0, map);
+    }
 
     return true;
 }