Fixed|BSP Builder: Vertex allocation must be C++ new

The partitioner was still allocating vertices using M_Malloc().
skyjake · Feb 8, 2013 · 5e01624 · 5e01624
1 parent d894f6e
commit 5e01624
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/doomsday/client/src/map/bsp/partitioner.cpp b/doomsday/client/src/map/bsp/partitioner.cpp
@@ -1991,10 +1991,7 @@ struct Partitioner::Instance
      */
     Vertex* newVertex(const_pvec2d_t origin)
     {
-        Vertex* vtx;
-
-        // Allocate with M_Calloc for uniformity with the editable vertexes.
-        vtx = static_cast<Vertex*>(M_Calloc(sizeof *vtx));
+        Vertex* vtx = new Vertex;
         vtx->buildData.index = numEditableVertexes + uint(vertexes.size() + 1); // 1-based index, 0 = NIL.
         vertexes.push_back(vtx);
 
@@ -2443,9 +2440,10 @@ Vertex& Partitioner::vertex(uint idx)
 
 Partitioner& Partitioner::release(de::MapElement* ob)
 {
+    LOG_AS("Partitioner::release");
+
     if(!d->release(ob))
     {
-        LOG_AS("Partitioner::release");
         LOG_DEBUG("Attempted to release an unknown/unowned object %p.") << de::dintptr(ob);
     }
     return *this;

diff --git a/doomsday/client/src/map/bspbuilder.cpp b/doomsday/client/src/map/bspbuilder.cpp
@@ -83,6 +83,7 @@ uint BspBuilder::numVertexes()
 
 Vertex& BspBuilder::vertex(uint idx)
 {
+    DENG2_ASSERT(partitioner->vertex(idx).type() == DMU_VERTEX);
     return partitioner->vertex(idx);
 }