Mercurial > fife-parpg

diff engine/core/video/image_location.cpp @ 146:54b3984e1afc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The getIndex function was a hack that shadowed another bug that caused the pools to misbehave. AddResourceFromFile works now exactly as getIndex, it's just faster. Fixed GUIImage to not hold a reference, it uses the index directly anyway. Plus heaps of minor adjustments for more informative debug output and statistics.
author phoku@33b003aa-7bff-0310-803a-e67f0ece8222
date Thu, 09 Oct 2008 12:36:21 +0000
parents 90005975cdbb
children fb6ccb367dd1
line wrap: on
line diff
--- a/engine/core/video/image_location.cpp	Thu Oct 09 08:23:13 2008 +0000
+++ b/engine/core/video/image_location.cpp	Thu Oct 09 12:36:21 2008 +0000
@@ -45,7 +45,7 @@
 		}
 		const ImageLocation* r = dynamic_cast<const ImageLocation*>(&loc);
 		if (!r) {
-			return true;
+			return false;
 		}
 		
 		if (m_xshift != r->m_xshift) {
@@ -72,6 +72,10 @@
 		}
 
 		const ImageLocation* r = dynamic_cast<const ImageLocation*>(&loc);
+		if (!r) {
+			return true;
+		}
+
 		if (m_xshift < r->m_xshift) {
 			return false;
 		}