adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Potential crasher fix. (Never triggered in UQM atm)

Browse Source 
Also a small optimisation.



git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3585 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
Meep-Eep
2011-04-24 14:01:34 +00:00
parent aa7e58a6b9
commit 18692267fb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/heap/heap.c
+5 -4
View File
@@ -103,6 +103,8 @@ Heap_removeByIndex(Heap *heap, size_t i) {
// Restore the heap invariant. We're shifting entries into the
// gap that was created until we find the place where we can
// insert the last entry.
HeapValue *lastEntry = heap->entries[heap->numEntries];
for (;;) {
size_t childI = i * 2 + 1;
// The two children are childI and 'childI + 1'.
@@ -114,7 +116,7 @@ Heap_removeByIndex(Heap *heap, size_t i) {
// There is no left child either.
break;
}
} else {
if (heap->comparator(heap->entries[childI + 1],
heap->entries[childI]) < 0) {
// The right child is the child with the lowest value.
@@ -123,8 +125,7 @@ Heap_removeByIndex(Heap *heap, size_t i) {
}
// childI is now the child with the lowest value.
if (heap->comparator(heap->entries[heap->numEntries],
heap->entries[childI]) <= 0) {
if (heap->comparator(lastEntry, heap->entries[childI]) <= 0) {
// The last entry goes here.
break;
}
@@ -138,7 +139,7 @@ Heap_removeByIndex(Heap *heap, size_t i) {
}
// Fill the gap with the last entry.
heap->entries[i] = heap->entries[heap->numEntries];
heap->entries[i] = lastEntry;
heap->entries[i]->index = i;
}