Fixed (Hexen): " ". [http://sourceforge.net/tracker/?func=detail&aid=…

…2855082&group_id=74815&atid=542099]

Fixed (Hexen): cvar "msg-hub-override", did not work.

doomsday/plugins/common/src/f_infine.c

@@ -763,13 +763,8 @@ int FI_Briefing(int episode, int map)
  */
 int FI_Debriefing(int episode, int map)
 {
-    char                mid[20];
-    ddfinale_t          fin;
-
-    // If we're already in the INFINE state, don't start a finale.
-    if(briefDisabled || G_GetGameState() == GS_INFINE || IS_CLIENT ||
-       Get(DD_PLAYBACK))
-        return false;
+    char mid[20];
+    ddfinale_t fin;
 
     // Is there such a finale definition?
     P_GetMapLumpName(episode, map, mid);

doomsday/plugins/common/src/g_game.c

@@ -1903,6 +1903,22 @@ void G_PrepareWIData(void)
 }
 #endif
 
+boolean G_DebriefingEnabled(void)
+{
+    // If we're already in the INFINE state, don't start a finale.
+    if(briefDisabled)
+        return false;
+#if __JHEXEN__
+    if(cfg.overrideHubMsg && G_GetGameState() == GS_MAP &&
+       P_GetMapCluster(gameMap) != P_GetMapCluster(leaveMap))
+        return false;
+#endif
+    if(G_GetGameState() == GS_INFINE || IS_CLIENT || Get(DD_PLAYBACK))
+        return false;
+
+    return true;
+}
+
 void G_WorldDone(void)
 {
 #if __JDOOM__ || __JDOOM64__
@@ -1911,14 +1927,19 @@ void G_WorldDone(void)
 #endif
 
     // Clear the currently playing script, if any.
+    // @note FI_Reset() changes the game state so we must determine
+    // whether the debrief is enabled first.
+    {
+    boolean doDebrief = G_DebriefingEnabled();
+
     FI_Reset();
 
-    // Is there a debriefing for this map?
-    if(FI_Debriefing(gameEpisode, gameMap))
+    if(doDebrief && FI_Debriefing(gameEpisode, gameMap))
         return;
 
     // We have either just returned from a debriefing or there wasn't one.
     briefDisabled = false;
+    }
 
     G_SetGameAction(GA_LEAVEMAP);
 }

doomsday/plugins/jdoom/src/m_cheat.c

@@ -335,13 +335,15 @@ int Cht_WarpFunc(const int* args, int player)
     if(!G_ValidateMap(&epsd, &map))
         return false;
 
-    // So be it.
     P_SetMessage(plr, STSTR_CLEV, false);
-    G_DeferedInitNew(gameSkill, epsd, map);
 
     // Clear the menu if open.
     Hu_MenuCommand(MCMD_CLOSE);
+
+    // So be it.
     briefDisabled = true;
+    G_DeferedInitNew(gameSkill, epsd, map);
+
     return true;
 }
 

doomsday/plugins/jdoom64/src/m_cheat.c

@@ -163,13 +163,15 @@ boolean Cht_WarpFunc(player_t* plr, cheatseq_t* cheat)
     if(!G_ValidateMap(&epsd, &map))
         return false;
 
-    // So be it.
     P_SetMessage(plr, STSTR_CLEV, false);
-    G_DeferedInitNew(gameSkill, epsd, map);
 
     // Clear the menu if open.
     Hu_MenuCommand(MCMD_CLOSE);
+
+    // So be it.
     briefDisabled = true;
+    G_DeferedInitNew(gameSkill, epsd, map);
+
     return true;
 }
 

doomsday/plugins/jheretic/src/m_cheat.c

@@ -332,15 +332,16 @@ int Cht_WarpFunc(const int* args, int player)
     if(!G_ValidateMap(&epsd, &map))
         return false;
 
-    // So be it.
     P_SetMessage(plr, TXT_CHEATWARP, false);
     S_LocalSound(SFX_DORCLS, NULL);
 
-    G_DeferedInitNew(gameSkill, epsd, map);
-
     // Clear the menu if open.
     Hu_MenuCommand(MCMD_CLOSE);
+
+    // So be it.
     briefDisabled = true;
+    G_DeferedInitNew(gameSkill, epsd, map);
+
     return true;
 }
 

doomsday/plugins/jhexen/src/m_cheat.c

@@ -401,16 +401,18 @@ int Cht_WarpFunc(const int* args, int player)
         return false;
     }
 
-    // So be it.
-    P_SetMessage(plr, TXT_CHEATWARP, false);
     S_LocalSound(SFX_PLATFORM_STOP, NULL);
-    leaveMap = map;
-    leavePosition = 0;
-    G_WorldDone();
+    P_SetMessage(plr, TXT_CHEATWARP, false);
 
     // Clear the menu if open.
     Hu_MenuCommand(MCMD_CLOSE);
+
+    // So be it.
+    leaveMap = map;
+    leavePosition = 0;
     briefDisabled = true;
+    G_WorldDone();
+
     return true;
 }