diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp index 24893fb18..12e5952a3 100644 --- a/source/core/gamecontrol.cpp +++ b/source/core/gamecontrol.cpp @@ -454,19 +454,18 @@ void UserConfig::ProcessOptions() void CheckUserMap() { if (userConfig.CommandMap.IsEmpty()) return; + if (FindMapByName(userConfig.CommandMap)) + { + return; // we already got a record for this map so no need for further checks. + } FString startupMap = userConfig.CommandMap; - if (startupMap.IndexOfAny("/\\") < 0) startupMap.Insert(0, "/"); DefaultExtension(startupMap, ".map"); startupMap.Substitute("\\", "/"); NormalizeFileName(startupMap); - if (fileSystem.FileExists(startupMap)) + if (!fileSystem.FileExists(startupMap)) { - Printf("Using level: \"%s\".\n", startupMap.GetChars()); - } - else - { - Printf("Level \"%s\" not found.\n", startupMap.GetChars()); + Printf(PRINT_HIGH, "Level \"%s\" not found.\n", startupMap.GetChars()); startupMap = ""; } userConfig.CommandMap = startupMap; diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp index 0707ab04a..e2339f757 100644 --- a/source/games/blood/src/blood.cpp +++ b/source/games/blood/src/blood.cpp @@ -453,11 +453,13 @@ void GameInterface::app_init() UpdateDacs(0, true); enginecompatibility_mode = ENGINECOMPATIBILITY_19960925; + + gViewIndex = myconnectindex; + gMe = gView = &gPlayer[myconnectindex]; } static void gameInit() { - //RESTART: gViewIndex = myconnectindex; gMe = gView = &gPlayer[myconnectindex];