From ed2f90533ae347a708b7121738becf3ffa259537 Mon Sep 17 00:00:00 2001 From: danij Date: Fri, 31 Jan 2014 19:54:10 +0000 Subject: [PATCH] Fixed|MapInfoParser|Hexen: Incorrect assignment of logical map numbers to map URIs --- doomsday/plugins/hexen/src/p_mapinfo.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doomsday/plugins/hexen/src/p_mapinfo.cpp b/doomsday/plugins/hexen/src/p_mapinfo.cpp index 405d85e047..0e3e9a2e2d 100644 --- a/doomsday/plugins/hexen/src/p_mapinfo.cpp +++ b/doomsday/plugins/hexen/src/p_mapinfo.cpp @@ -76,8 +76,6 @@ void MapInfoParser(Str const *path) strcpy(defMapInfo.title, "DEVELOPMENT MAP"); // Unknown. strcpy(defMapInfo.songLump, "DEFSONG"); // Unknown. - uint logicalMapIndex = 0; - HexLex lexer(script, path); while(lexer.readToken()) @@ -132,9 +130,9 @@ void MapInfoParser(Str const *path) memcpy(info, &defMapInfo, sizeof(*info)); // Assign a logical map index. - info->map = logicalMapIndex++; + info->map = tmap - 1; - // The warp translation defaults to the map number. + // The warp translation defaults to the logical map index. info->warpTrans = tmap - 1; } Uri_Delete(mapUri); @@ -239,8 +237,8 @@ void MapInfoParser(Str const *path) for(MapInfos::const_iterator i = mapInfos.begin(); i != mapInfos.end(); ++i) { mapinfo_t const &info = i->second; - App_Log(DE2_DEV_RES_MSG, "MAPINFO %s { title: \"%s\" map: %i warp: %i }", - i->first.c_str(), info.title, info.map, info.warpTrans); + App_Log(DE2_DEV_RES_MSG, "MAPINFO %s { title: \"%s\" cluster: %i map: %i warp: %i }", + i->first.c_str(), info.title, info.cluster, info.map, info.warpTrans); } #endif }