fix duplicate model crash

UnrealKaraulov · Nov 27, 2022 · 380a9ae · 380a9ae
1 parent 9034522
commit 380a9ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/bsp/Bsp.cpp b/src/bsp/Bsp.cpp
@@ -4330,8 +4330,6 @@ void Bsp::copy_bsp_model(int modelIdx, Bsp* targetMap, STRUCTREMAP& remap, std::
 	STRUCTUSAGE usage(this);
 	mark_model_structures(modelIdx, &usage, true);
 
-	remap = STRUCTREMAP(this);
-
 	for (unsigned int i = 0; i < usage.count.planes; i++)
 	{
 		if (usage.planes[i])
@@ -4480,7 +4478,7 @@ int Bsp::duplicate_model(int modelIdx)
 	std::vector<BSPNODE> newNodes;
 	std::vector<BSPCLIPNODE> newClipnodes;
 
-	STRUCTREMAP remap;
+	STRUCTREMAP remap(this);
 
 	copy_bsp_model(modelIdx, this, remap, newPlanes, newVerts, newEdges, newSurfedges, newTexinfo, newFaces, newLightmaps, newNodes, newClipnodes);
 

diff --git a/src/editor/Gui.cpp b/src/editor/Gui.cpp
@@ -4021,9 +4021,9 @@ void Gui::drawImportMapWidget()
 					std::vector<BSPNODE> newNodes;
 					std::vector<BSPCLIPNODE> newClipnodes;
 
-					STRUCTREMAP* remap = new STRUCTREMAP();
+					STRUCTREMAP remap(map);
 
-					bspModel->copy_bsp_model(0, map, *remap, newPlanes, newVerts, newEdges, newSurfedges, newTexinfo, newFaces, newLightmaps, newNodes, newClipnodes);
+					bspModel->copy_bsp_model(0, map, remap, newPlanes, newVerts, newEdges, newSurfedges, newTexinfo, newFaces, newLightmaps, newNodes, newClipnodes);
 
 					if (newClipnodes.size())
 						map->append_lump(LUMP_CLIPNODES, &newClipnodes[0], sizeof(BSPCLIPNODE) * newClipnodes.size());