Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -58,7 +58,7 @@ Node *BinaryHeap::pop()
|
||||
{
|
||||
Node *popped = heap[0];
|
||||
heap[0] = heap[--sizeVar];
|
||||
heap[sizeVar] = nullptr;
|
||||
heap[sizeVar] = NULL;
|
||||
if (sizeVar > 0) downHeap(0);
|
||||
popped->heapIdx=-1;
|
||||
return popped;
|
||||
@@ -68,7 +68,7 @@ void BinaryHeap::remove(Node *node)
|
||||
{
|
||||
// This is what node.heapIdx is for.
|
||||
heap[node->heapIdx] = heap[--sizeVar];
|
||||
heap[sizeVar] = nullptr;
|
||||
heap[sizeVar] = NULL;
|
||||
if (sizeVar > node->heapIdx)
|
||||
{
|
||||
if (heap[node->heapIdx]->f < node->f)
|
||||
@@ -145,7 +145,7 @@ void BinaryHeap::downHeap(int idx)
|
||||
if (rightIdx >= sizeVar)
|
||||
{
|
||||
// Only need to compare with left.
|
||||
rightNode = nullptr;
|
||||
rightNode = NULL;
|
||||
rightCost = Float::POSITIVE_INFINITY;
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user