[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.103,1.104 screen.cpp,1.31,1.32

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv31486/sky

Modified Files:
	logic.cpp screen.cpp 
Log Message:
finally fixed this stupid animation bug

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- logic.cpp	27 Jun 2003 14:42:45 -0000	1.103
+++ logic.cpp	30 Jun 2003 16:59:41 -0000	1.104
@@ -697,7 +697,7 @@
 		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::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;
 }

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- screen.cpp	9 Jun 2003 23:21:31 -0000	1.31
+++ screen.cpp	30 Jun 2003 16:59:41 -0000	1.32
@@ -300,6 +300,12 @@
 
 	//_currentScreen points to new screen,
 	//_scrollScreen points to graphic showing old room
+	if (scroll == 13) scroll = 123; // script bug (?) in lower area
+	if ((scroll != 123) && (scroll != 321) && (scroll)) {
+		warning("unknown scroll parameter %d",scroll);
+		scroll = 0;
+	}
+
 	if ((scroll == 0) || (SkyState::_systemVars.systemFlags & SF_NO_SCROLL)) {
 		uint8 *palette = (uint8*)SkyState::fetchCompact(palNum);
 		if (palette == NULL)
@@ -350,7 +356,7 @@
 		}
 		showScreen(_currentScreen);
 		free(_scrollScreen);
-	} else error("Unknown scroll parameter: %d\n",scroll);
+	}
 }
 
 void SkyScreen::waitForTimer(void) {