[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.528,1.529 simon.h,1.154,1.155 vga.cpp,1.143,1.144

[kirben]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19521/simon

Modified Files:
	simon.cpp simon.h vga.cpp 
Log Message:

Palette delay at the end of Simon1 was never triggered.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -d -r1.528 -r1.529
--- simon.cpp	9 Nov 2005 23:06:18 -0000	1.528
+++ simon.cpp	9 Nov 2005 23:36:55 -0000	1.529
@@ -509,7 +509,7 @@
 	_vgaRes328Loaded = 0;
 	_hitarea_unk_3 = 0;
 	_mortalFlag = 0;
-	_videoVar8 = 0;
+	_updateScreen = 0;
 	_usePaletteDelay = 0;
 	_syncFlag2 = 0;
 	_inCallBack = 0;
@@ -2551,11 +2551,9 @@
 			b += sizeof(ImageHeader_Simon);
 	}
 
-	if (!(_game & GF_SIMON2)) {
-		if (num == 16300) {
-			dx_clear_attached_from_top(134);
-			_usePaletteDelay = true;
-		}
+	if ((_game & GF_SIMON1) && vga_res_id == 16300) {
+		dx_clear_attached_from_top(134);
+		_usePaletteDelay = true;
 	} else {
 		_scrollX = 0;
 		_scrollXMax = 0;
@@ -2845,7 +2843,7 @@
 	if (_drawImagesDebug)
 		memset(_sdl_buf_attached, 0, _screenWidth * _screenHeight);
 
-	_videoVar8++;
+	_updateScreen++;
 	_vcPtr = vc_ptr_org;
 }
 
@@ -2917,7 +2915,7 @@
 		vsp++;
 	}
 
-	_videoVar8++;
+	_updateScreen++;
 	_vcPtr = vc_ptr_org;
 }
 
@@ -2959,10 +2957,10 @@
 		_copyPartialMode = 0;
 	}
 
-	if (_videoVar8) {
+	if (_updateScreen) {
 		handle_mouse_moved();
 		dx_update_screen_and_palette();
-		_videoVar8 = false;
+		_updateScreen = false;
 	}
 
 	_lockWord &= ~2;
@@ -3551,7 +3549,7 @@
 void SimonEngine::talk_with_text(uint vgaSpriteId, uint color, const char *string, int16 x, int16 y, int16 width) {
 	char convertedString[320];
 	char *convertedString2 = convertedString;
-	int16 height, delay;
+	int16 height, talkDelay;
 	int stringLength = strlen(string);
 	int padding, lettersPerRow, lettersPerRowJustified;
 	const int textHeight = 10;
@@ -3560,17 +3558,17 @@
 	lettersPerRow = width / 6;
 	lettersPerRowJustified = stringLength / (stringLength / lettersPerRow + 1) + 1;
 
-	delay = (stringLength + 3) / 3;
+	talkDelay = (stringLength + 3) / 3;
 	if ((_game & GF_SIMON1) && (_game & GF_TALKIE)) {
 		if (_variableArray[141] == 0)
 			_variableArray[141] = 9;
-		_variableArray[85] = _variableArray[141] * delay;
+		_variableArray[85] = _variableArray[141] * talkDelay;
 	} else {
 		if (_variableArray[86] == 0)
-			delay /= 2;
+			talkDelay /= 2;
 		if (_variableArray[86] == 2)
-			delay *= 2;
-		_variableArray[85] = delay * 5;
+			talkDelay *= 2;
+		_variableArray[85] = talkDelay * 5;
 	}
 
 	assert(stringLength > 0);

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- simon.h	8 Nov 2005 11:34:56 -0000	1.154
+++ simon.h	9 Nov 2005 23:36:55 -0000	1.155
@@ -190,7 +190,7 @@
 	bool _vgaRes328Loaded;
 	bool _hitarea_unk_3;
 	bool _mortalFlag;
-	byte _videoVar8;
+	byte _updateScreen;
 	bool _usePaletteDelay;
 	bool _syncFlag2;
 	bool _inCallBack;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- vga.cpp	8 Nov 2005 11:34:56 -0000	1.143
+++ vga.cpp	9 Nov 2005 23:36:55 -0000	1.144
@@ -1394,7 +1394,7 @@
 }
 
 void SimonEngine::vc36_setWindowImage() {
-	_videoVar8 = false;
+	_updateScreen = false;
 	uint vga_res = vc_read_next_word();
 	uint windowNum = vc_read_next_word();