mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19240) -Codechange: Unify HeapifyUp code (skidd13)

release/1.1
yexo 2010-02-25 11:47:44 +00:00
parent b4c51f2ccd
commit eeb8189745
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/misc/binaryheap.hpp
View File

@ -117,8 +117,17 @@ public:
/* make place for new item */ /* make place for new item */
uint gap = ++m_size; uint gap = ++m_size;
/* Heapify up */ /* Heapify up */
for (uint parent = gap / 2; (parent > 0) && (new_item < *m_items[parent]); gap = parent, parent /= 2) while (gap > 1) {
/* compare [gap] with its parent */
uint parent = gap / 2;
if (new_item < *m_items[parent]) {
m_items[gap] = m_items[parent]; m_items[gap] = m_items[parent];
gap = parent;
} else {
/* we don't need to continue upstairs */
break;
}
}
m_items[gap] = &new_item; m_items[gap] = &new_item;
CheckConsistency(); CheckConsistency();
} }