From b421c9fde992191f61f324e9741875e3667a7a87 Mon Sep 17 00:00:00 2001
From: Robert Göffringmann
Date: Mon, 30 Jun 2003 16:59:41 +0000
Subject: finally fixed this stupid animation bug

svn-id: r8675
---
 sky/logic.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sky/logic.cpp')

diff --git a/sky/logic.cpp b/sky/logic.cpp
index efb1dc7f23..c18ca5b6ec 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -697,7 +697,7 @@ bool SkyLogic::collide(Compact *cpt) {
 		x -= m1->colOffset; // compensate for inner x offsets
 		x += m2->colOffset;
 
-		if ((x + m2->colWidth) >= _compact->xcood) // their rightmoast
+		if ((x + m2->colWidth) < _compact->xcood) // their rightmoast
 			return false;
 
 		x -= m1->colWidth; // our left, their right
@@ -1280,6 +1280,7 @@ bool SkyLogic::fnCacheFast(uint32 a, uint32 b, uint32 c) {
 
 bool SkyLogic::fnDrawScreen(uint32 a, uint32 b, uint32 c) {
 	debug(5, "Call: fnDrawScreen(%X, %X)\n",a,b);
+	SkyState::_systemVars.currentPalette = a;
 	_skyScreen->fnDrawScreen(a, b);
 	return true;
 }
-- 
cgit v1.2.3