Wad Map Converter: Minor fixes

skyjake · Jul 23, 2012 · 128e578 · 128e578
1 parent b811efa
commit 128e578
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/doomsday/plugins/wadmapconverter/src/id1map_load.cpp b/doomsday/plugins/wadmapconverter/src/id1map_load.cpp
@@ -1596,8 +1596,6 @@ int LoadMap(MapLumpInfo* lumpInfos[NUM_MAPLUMP_TYPES])
 {
     DENG_ASSERT(lumpInfos);
 
-    memset(DENG_PLUGIN_GLOBAL(map), 0, sizeof(*DENG_PLUGIN_GLOBAL(map)));
-
     // Allocate the data structure arrays.
     map->vertexes =   (coord_t*)malloc(map->numVertexes * 2 * sizeof(*map->vertexes));
     map->lines    =   (mline_t*)malloc(map->numLines * sizeof(mline_t));

diff --git a/doomsday/plugins/wadmapconverter/src/wadmapconverter.cpp b/doomsday/plugins/wadmapconverter/src/wadmapconverter.cpp
@@ -163,6 +163,7 @@ int ConvertMapHook(int hookType, int parm, void* context)
     collectMapLumps(lumpInfos, markerLump + 1 /*begin after the marker*/);
 
     // Do we recognise this format?
+    memset(DENG_PLUGIN_GLOBAL(map), 0, sizeof(*DENG_PLUGIN_GLOBAL(map)));
     recogniseMapFormat(lumpInfos);
     if(DENG_PLUGIN_GLOBAL(mapFormat) == MF_UNKNOWN)
     {