zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-25 10:11:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed map ccmd.

Browse source 
Something got lost when implementing user maps.
This commit is contained in:
Christoph Oelckers 2021-12-27 10:33:29 +01:00
parent 913f6e713d
commit 1f2abda23c
1 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
source/core/cheats.cpp
View file

@ -414,28 +414,6 @@ CCMD(changemap)
//
//---------------------------------------------------------------------------
void DoStartMap(FString mapname)
{
FString mapfilename = mapname;
DefaultExtension(mapfilename, ".map");
// Check if the map is already defined.
auto map = FindMapByName(mapname);
if (map == nullptr)
{
map = SetupUserMap(mapfilename, g_gameType & GAMEFLAG_DUKE ? "dethtoll.mid" : nullptr);
}
if (map)
{
if (fileSystem.FindFile(map->fileName) < 0)
{
Printf(PRINT_BOLD, "%s: map file not found\n", map->fileName.GetChars());
}
DeferredStartGame(map, g_nextskill);
}
}
CCMD(map)
{
if (argv.argc() < 2)
@ -450,7 +428,24 @@ CCMD(map)
return;
}
FString mapname = argv[1];
FString mapfilename = argv[1];
DefaultExtension(mapfilename, ".map");
// Check if the map is already defined.
auto map = FindMapByName(argv[1]);
if (map == nullptr)
{
map = SetupUserMap(mapfilename, g_gameType & GAMEFLAG_DUKE ? "dethtoll.mid" : nullptr);
}
if (map)
{
if (fileSystem.FindFile(map->fileName) < 0)
{
Printf(PRINT_BOLD, "%s: map file not found\n", map->fileName.GetChars());
}
DeferredStartGame(map, g_nextskill);
}
}
//---------------------------------------------------------------------------