Skip to content

Commit

Permalink
Cleanup|libcommon: Removed now redundant P_SetupMap() arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
danij-deng committed Jul 10, 2012
1 parent 0db43ca commit b58ea7a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion doomsday/plugins/common/include/p_mapsetup.h
Expand Up @@ -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);
Expand Down
10 changes: 3 additions & 7 deletions doomsday/plugins/common/src/g_game.c
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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();
Expand All @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion doomsday/plugins/common/src/p_mapsetup.c
Expand Up @@ -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;
Expand Down

0 comments on commit b58ea7a

Please sign in to comment.