From eeb81897450aae2808f4b38726b4026b8a58f3a7 Mon Sep 17 00:00:00 2001
From: yexo <yexo@openttd.org>
Date: Thu, 25 Feb 2010 11:47:44 +0000
Subject: (svn r19240) -Codechange: Unify HeapifyUp code (skidd13)

---
 src/misc/binaryheap.hpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/misc/binaryheap.hpp b/src/misc/binaryheap.hpp
index a50ee086a..04343af41 100644
--- a/src/misc/binaryheap.hpp
+++ b/src/misc/binaryheap.hpp
@@ -117,8 +117,17 @@ public:
 		/* make place for new item */
 		uint gap = ++m_size;
 		/* Heapify up */
-		for (uint parent = gap / 2; (parent > 0) && (new_item < *m_items[parent]); gap = parent, parent /= 2)
-			m_items[gap] = m_items[parent];
+		while (gap > 1) {
+			/* compare [gap] with its parent */
+			uint parent = gap / 2;
+			if (new_item < *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;
 		CheckConsistency();
 	}
-- 
cgit v1.2.3-54-g00ecf