[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.91,1.92 screen.cpp,1.27,1.28 sky.cpp,1.55,1.56

[Robert G?ffringmann]

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

Modified Files:
	logic.cpp screen.cpp sky.cpp 
Log Message:
changed sprite priority, changed some errors to warnings and added hack to get past the first scene

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- logic.cpp	6 Jun 2003 17:02:10 -0000	1.91
+++ logic.cpp	6 Jun 2003 17:59:22 -0000	1.92
@@ -1393,9 +1393,14 @@
 }
 
 bool SkyLogic::fnGetTo(uint32 targetPlaceId, uint32 mode, uint32 c) {
-	_compact->upFlag = (uint16)mode; // save mode for action script
+ 	_compact->upFlag = (uint16)mode; // save mode for action script
 	_compact->mode += 4; // next level up
 	Compact *cpt = SkyState::fetchCompact(_compact->place);
+	if (!cpt) { 
+		// FIXME: This should never happen
+		warning("can't find _compact's getToTable. Place compact is NULL");
+		return false; 
+	}
 	uint16 *getToTable = cpt->getToTable;
 
 	while (*getToTable != targetPlaceId)
@@ -1959,7 +1964,8 @@
 }
 
 bool SkyLogic::fnRandom(uint32 a, uint32 b, uint32 c) {
-	error("Stub: fnRandom");
+	warning("Stub: fnRandom");
+	return true;
 }
 
 bool SkyLogic::fnPersonHere(uint32 id, uint32 room, uint32 c) {
@@ -2218,7 +2224,8 @@
 }
 
 bool SkyLogic::fnStopFx(uint32 a, uint32 b, uint32 c) {
-	error("Stub: fnStopFx");
+	warning("Stub: fnStopFx");
+	return true;
 }
 
 bool SkyLogic::fnStartMusic(uint32 a, uint32 b, uint32 c) {
@@ -2246,12 +2253,12 @@
 }
 
 bool SkyLogic::fnPauseFx(uint32 a, uint32 b, uint32 c) {
-	//warning("Stub: fnPauseFx");
+	warning("Stub: fnPauseFx");
 	return true;
 }
 
 bool SkyLogic::fnUnPauseFx(uint32 a, uint32 b, uint32 c) {
-	//warning("Stub: fnUnPauseFx");
+	warning("Stub: fnUnPauseFx");
 	return true;
 }
 

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- screen.cpp	5 Jun 2003 18:54:26 -0000	1.27
+++ screen.cpp	6 Jun 2003 17:59:22 -0000	1.28
@@ -516,7 +516,7 @@
 		if (spriteCnt > 1) { // bubble sort
 			for (uint32 cnt1 = 0; cnt1 < spriteCnt - 1; cnt1++)
 				for (uint32 cnt2 = cnt1 + 1; cnt2 < spriteCnt; cnt2++)
-					if (sortList[cnt1].yCood <= sortList[cnt2].yCood) {
+					if (sortList[cnt1].yCood >= sortList[cnt2].yCood) {
 						StSortList tmp;
 						tmp.yCood = sortList[cnt1].yCood;
 						tmp.sprite = sortList[cnt1].sprite;
@@ -643,7 +643,7 @@
 	for (uint8 cnty = 0; cnty < _sprHeight; cnty++) {
 		for (uint8 cntx = 0; cntx < _sprWidth; cntx++)
 			if (spriteData[cntx + _maskX1]) screenPtr[cntx] = spriteData[cntx + _maskX1];
-		spriteData += _sprWidth + _maskX2;
+		spriteData += _sprWidth + _maskX2 + _maskX1;
 		screenPtr += GAME_SCREEN_WIDTH;
 	}
 	// Convert the sprite coordinate/size values to blocks for vertical mask and/or vector to game

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- sky.cpp	6 Jun 2003 01:14:17 -0000	1.55
+++ sky.cpp	6 Jun 2003 17:59:22 -0000	1.56
@@ -67,7 +67,8 @@
 	_mixer->setVolume(detector->_sfx_volume); //unnecessary?
 	
 	_debugMode = detector->_debugMode;
-	_debugLevel = detector->_debugLevel;
+	//_debugLevel = detector->_debugLevel;
+	_debugLevel = 9;
 	_systemVars.language = detector->_language;
 	_detector = detector;