From b58ea7a554613e77ed135c7abe655a877b1cec29 Mon Sep 17 00:00:00 2001
From: danij <danij@dengine.net>
Date: Tue, 10 Jul 2012 03:34:32 +0100
Subject: [PATCH] Cleanup|libcommon: Removed now redundant P_SetupMap()
 arguments

---
 doomsday/plugins/common/include/p_mapsetup.h |  2 +-
 doomsday/plugins/common/src/g_game.c         | 10 +++-------
 doomsday/plugins/common/src/p_mapsetup.c     |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/doomsday/plugins/common/include/p_mapsetup.h b/doomsday/plugins/common/include/p_mapsetup.h
index 94ab8e1b85..83f95a508d 100644
--- a/doomsday/plugins/common/include/p_mapsetup.h
+++ b/doomsday/plugins/common/include/p_mapsetup.h
@@ -49,7 +49,7 @@ void P_SetupForMapData(int type, uint num);
 /**
  * Load the specified map.
  */
-void P_SetupMap(uint episode, uint map, skillmode_t skill, int playermask);
+void P_SetupMap(uint episode, uint map);
 
 const char* P_GetMapNiceName(void);
 patchid_t P_FindMapTitlePatch(uint episode, uint map);
diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
index 1f561ac887..32ada9c34e 100644
--- a/doomsday/plugins/common/src/g_game.c
+++ b/doomsday/plugins/common/src/g_game.c
@@ -1188,14 +1188,12 @@ void G_EndGame(void)
 typedef struct {
     uint episode;
     uint map;
-    skillmode_t skill;
-    int playerMask;
 } loadmapworker_params_t;
 
 static int G_LoadMapWorker(void* parameters)
 {
     loadmapworker_params_t* p = (loadmapworker_params_t*) parameters;
-    P_SetupMap(p->episode, p->map, p->skill, p->playerMask);
+    P_SetupMap(p->episode, p->map);
     BusyMode_WorkerEnd();
     /// @fixme Do not assume!
     return 0; // Assume success.
@@ -1255,7 +1253,7 @@ void G_DoLoadMap(void)
     {
 #if __JHEXEN__
         /**
-         * \kludge Due to the way music is managed with Hexen, unless we
+         * @note Kludge: Due to the way music is managed with Hexen, unless we
          * explicitly stop the current playing track the engine will not
          * change tracks. This is due to the use of the runtime-updated
          * "currentmap" definition (the engine thinks music has not changed
@@ -1264,7 +1262,7 @@ void G_DoLoadMap(void)
          * The only reason it worked previously was because the
          * waiting-for-map-load song was started prior to load.
          *
-         * \todo Rethink the Music definition stuff with regard to Hexen.
+         * @todo Rethink the Music definition stuff with regard to Hexen.
          * Why not create definitions during startup by parsing MAPINFO?
          */
         S_StopMusic();
@@ -1281,8 +1279,6 @@ void G_DoLoadMap(void)
      */
     p.episode    = gameEpisode;
     p.map        = gameMap;
-    p.skill      = gameSkill;
-    p.playerMask = 0;
 
     /// @todo Use progress bar mode and update progress during the setup.
     BusyMode_RunNewTaskWithName(BUSYF_ACTIVITY | /*BUSYF_PROGRESS_BAR |*/ BUSYF_TRANSITION | (verbose? BUSYF_CONSOLE_OUTPUT : 0),
diff --git a/doomsday/plugins/common/src/p_mapsetup.c b/doomsday/plugins/common/src/p_mapsetup.c
index 599d37a3b8..4e14917a07 100644
--- a/doomsday/plugins/common/src/p_mapsetup.c
+++ b/doomsday/plugins/common/src/p_mapsetup.c
@@ -719,7 +719,7 @@ static void spawnMapObjects(void)
     P_SpawnPlayers();
 }
 
-void P_SetupMap(uint episode, uint map, skillmode_t skill, int playerMask)
+void P_SetupMap(uint episode, uint map)
 {
     ddstring_t* mapPath;
     Uri* mapUri;