- added MAPINFO parser, based on GZDoom's.

This isn't hooked up yet, but all necessary structures and fields have been added so that selected pieces can be tested.
ZDoom · May 1, 2021 · f732d4e · f732d4e
1 parent 51aeb6d
commit f732d4e
Show file tree

Hide file tree

Showing 19 changed files with 1,337 additions and 56 deletions.
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -1048,6 +1048,7 @@ set (PCH_SOURCES
 	core/gamehud.cpp
 	core/gamefuncs.cpp
 	core/gameinput.cpp
+	core/g_mapinfo.cpp
 	core/interpolate.cpp
 	core/inputstate.cpp
 	core/maphack.cpp

diff --git a/source/core/cheats.cpp b/source/core/cheats.cpp
@@ -294,7 +294,7 @@ static MapRecord* levelwarp_common(FCommandLine& argv, const char *cmdname, cons
 		Printf(PRINT_BOLD, "Invalid level! Numbers must be > 0\n");
 		return nullptr;
 	}
-	auto map = FindMapByLevelNum(numparm == 1 ? m : levelnum(e - 1, m - 1));
+	auto map = FindMapByLevelNum(numparm == 1 ? m : makelevelnum(e - 1, m - 1));
 	if (!map)
 	{
 		if (numparm == 2) Printf(PRINT_BOLD, "Level E%s L%s not found!\n", argv[1], argv[2]);