Skip to content

Commit

Permalink
Fixed|MapInfoParser|Hexen: Incorrect assignment of logical map number…
Browse files Browse the repository at this point in the history
…s to map URIs
  • Loading branch information
danij-deng committed Jan 31, 2014
1 parent 69d5db6 commit ed2f905
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions doomsday/plugins/hexen/src/p_mapinfo.cpp
Expand Up @@ -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())
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit ed2f905

Please sign in to comment.