[Scummvm-cvs-logs] CVS: scummvm/sky autoroute.cpp,1.10,1.11 control.cpp,1.7,1.8 control.h,1.5,1.6 logic.cpp,1.107,1.108 sky.cpp,1.67,1.68 sky.h,1.35,1.36

[Robert G?ffringmann]

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

Modified Files:
	autoroute.cpp control.cpp control.h logic.cpp sky.cpp sky.h 
Log Message:
bass is completable now.

Index: autoroute.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/autoroute.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- autoroute.cpp	29 May 2003 19:36:02 -0000	1.10
+++ autoroute.cpp	1 Jul 2003 22:21:20 -0000	1.11
@@ -362,11 +362,11 @@
 #endif
 	// the route is done. if there was an initial x/y movement tag it onto the start
 	if (initX < 0) {
-        saveRoute -= 4;
+        saveRoute -= 2;
 		saveRoute[1] = RIGHTY;
 		saveRoute[0] = ((-initX) + 7) & 0xFFF8;
 	} else if (initX > 0) {
-		saveRoute -= 4;
+		saveRoute -= 2;
 		saveRoute[1] = LEFTY;
 		saveRoute[0] = (initX + 7) & 0xFFF8;
 	}

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- control.cpp	1 Jul 2003 16:06:09 -0000	1.7
+++ control.cpp	1 Jul 2003 22:21:20 -0000	1.8
@@ -176,7 +176,10 @@
 	_sprites.slode			= _skyDisk->loadFile(60506, NULL);
 	_sprites.slode2			= _skyDisk->loadFile(60507, NULL);
 	_sprites.slide2			= _skyDisk->loadFile(60508, NULL);
-	_sprites.musicBodge		= _skyDisk->loadFile(60509, NULL);
+	if (SkyState::_systemVars.gameVersion < 368) 
+		_sprites.musicBodge = NULL;
+	else
+		_sprites.musicBodge = _skyDisk->loadFile(60509, NULL);
     
 	//Main control panel:                                            X    Y Text       OnClick
 	_controlPanel     = createResource(_sprites.controlPanel, 1, 0,  0,   0,  0,      DO_NOTHING, MAINPANEL);
@@ -297,7 +300,10 @@
 	initPanel();
 
 	_skyScreen->clearScreen();
-	_skyScreen->setPalette(60510);
+	if (SkyState::_systemVars.gameVersion < 368)
+		_skyScreen->setPalette(60509);
+	else 
+		_skyScreen->setPalette(60510);
 	
 	drawMainPanel();
 

Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- control.h	1 Jul 2003 16:06:09 -0000	1.5
+++ control.h	1 Jul 2003 22:21:20 -0000	1.6
@@ -106,7 +106,7 @@
 #define SAVE_GRAFX	32
 #define SAVE_TURNP	64
 
-#define SAVE_FILE_REVISION 1
+#define SAVE_FILE_REVISION 2
 
 struct AllocedMem {
 	uint16 *mem;

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- logic.cpp	1 Jul 2003 16:06:09 -0000	1.107
+++ logic.cpp	1 Jul 2003 22:21:20 -0000	1.108
@@ -1127,7 +1127,7 @@
 	else
 		scriptData += READ_LE_UINT16(scriptData + (scriptNo & 0x0fff));
 
-	uint32 a, b, c;
+	uint32 a = 0, b = 0, c = 0;
 	uint16 command, s;
 
 	for (;;) {
@@ -1173,7 +1173,7 @@
 				scriptData += s/2;
 			break;
 		case 6: // pop_var
-			_scriptVariables[READ_LE_UINT16(scriptData++)/4] = pop();
+			b = _scriptVariables[READ_LE_UINT16(scriptData++)/4] = pop();
 			break;
 		case 7: // minus
 			a = pop();
@@ -1200,7 +1200,6 @@
 		case 11: // call_mcode
 			{
 				a = READ_LE_UINT16(scriptData++);
-				b = c = 0;
 				assert(a <= 3);
 				// No, I did not forget the "break"s
 				switch (a) {
@@ -1232,7 +1231,7 @@
 				push(0);
 			break;
 		case 14: // switch
-			s = READ_LE_UINT16(scriptData++); // get number of cases
+			c = s = READ_LE_UINT16(scriptData++); // get number of cases
 
 			a = pop(); // and value to switch on
 

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- sky.cpp	1 Jul 2003 13:04:00 -0000	1.67
+++ sky.cpp	1 Jul 2003 22:21:20 -0000	1.68
@@ -103,25 +103,36 @@
 
 	loadBase0();
 
+	_paintGrid = false;
+
 	while (1) {
 		delay(_systemVars.gameSpeed);
-		/*if (_key_pressed == 'g') {
+		if (_key_pressed == 'r') {
 			warning("loading grid");
 			_skyLogic->_skyGrid->loadGrids();
 			_key_pressed = 0;
-		}*/
-		if ((_key_pressed == 27) || (_key_pressed == 63)) { // 27 = escape, 63 = F5
+		}
+		if (_key_pressed == 'g') {
+			_paintGrid = !_paintGrid;
+			warning("Grid paint: %s",(_paintGrid)?("ON"):("OFF"));
+			if (!_paintGrid)
+				_skyScreen->forceRefresh();
+			_key_pressed = 0;
+		}
+		if (_key_pressed == 63) {
 			_key_pressed = 0;
 			_skyControl->doControlPanel();
 		}
 		_skyMouse->mouseEngine((uint16)_sdl_mouse_x, (uint16)_sdl_mouse_y);
 		_skyLogic->engine();
 		if (!_skyLogic->checkProtection()) { // don't let copy prot. screen flash up
-			//_skyScreen->forceRefresh();
+			if (_paintGrid)
+				_skyScreen->forceRefresh();
 			_skyScreen->recreate();
 			_skyScreen->spriteEngine();
 			_skyScreen->flip();
-			//_skyScreen->showGrid(_skyLogic->_skyGrid->giveGrid(SkyLogic::_scriptVariables[SCREEN]));
+			if (_paintGrid)
+				_skyScreen->showGrid(_skyLogic->_skyGrid->giveGrid(SkyLogic::_scriptVariables[SCREEN]));
 			_system->update_screen();
 		}
 	}

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- sky.h	27 Jun 2003 02:54:05 -0000	1.35
+++ sky.h	1 Jul 2003 22:21:20 -0000	1.36
@@ -66,6 +66,7 @@
 
 	uint16 _debugMode;
 	uint16 _debugLevel;
+	bool _paintGrid;
 
 	int _numScreenUpdates;