[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.132,1.133 simon.cpp,1.523,1.524 vga.cpp,1.140,1.141

[kirben]

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

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

Cleanup.


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- items.cpp	19 Oct 2005 11:32:25 -0000	1.132
+++ items.cpp	23 Oct 2005 11:17:15 -0000	1.133
@@ -1622,17 +1622,10 @@
 
 void SimonEngine::o_unk_120(uint a) {
 	uint16 id = TO_BE_16(a);
-	if (_game & GF_SIMON2) {
-		_lockWord |= 0x8000;
-		_vcPtr = (byte *)&id;
-		vc15_wakeup_id();
-		_lockWord &= ~0x8000;
-	} else {
-		_lockWord |= 0x4000;
-		_vcPtr = (byte *)&id;
-		vc15_wakeup_id();
-		_lockWord &= ~0x4000;
-	}
+	_lockWord |= 0x8000;
+	_vcPtr = (byte *)&id;
+	vc15_wakeup_id();
+	_lockWord &= ~0x8000;
 }
 
 void SimonEngine::o_play_sound(uint sound_id) {
@@ -1655,10 +1648,10 @@
 
 void SimonEngine::o_kill_sprite_simon1(uint a) {
 	uint16 b = TO_BE_16(a);
-	_lockWord |= 0x4000;
+	_lockWord |= 0x8000;
 	_vcPtr = (byte *)&b;
 	vc60_killSprite();
-	_lockWord &= ~0x4000;
+	_lockWord &= ~0x8000;
 }
 
 void SimonEngine::o_kill_sprite_simon2(uint a, uint b) {

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -d -r1.523 -r1.524
--- simon.cpp	19 Oct 2005 11:32:25 -0000	1.523
+++ simon.cpp	23 Oct 2005 11:17:15 -0000	1.524
@@ -2744,15 +2744,9 @@
 }
 
 void SimonEngine::o_force_lock() {
-	if (_game & GF_SIMON2) {
-		_lockWord |= 0x8000;
-		vc34_setMouseOff();
-		_lockWord &= ~0x8000;
-	} else {
-		_lockWord |= 0x4000;
-		vc34_setMouseOff();
-		_lockWord &= ~0x4000;
-	}
+	_lockWord |= 0x8000;
+	vc34_setMouseOff();
+	_lockWord &= ~0x8000;
 }
 
 void SimonEngine::o_wait_for_vga(uint a) {
@@ -2924,13 +2918,8 @@
 void SimonEngine::timer_proc1() {
 	_timer4++;
 
-	if (_game & GF_SIMON2) {
-		if (_lockWord & 0x80E9 || _lockWord & 2)
-			return;
-	} else {
-		if (_lockWord & 0xC0E9 || _lockWord & 2)
-			return;
-	}
+	if (_lockWord & 0x80E9 || _lockWord & 2)
+		return;
 
 	_timer1++;
 
@@ -2944,7 +2933,7 @@
 		if (!_cepeFlag)
 			expire_vga_timers();
 
-		if (_lockCounter != 0 && !_syncFlag2) {
+		if (_lockCounter != 0 && _syncFlag2) {
 			_lockWord &= ~2;
 			return;
 		}
@@ -2987,15 +2976,9 @@
 }
 
 void SimonEngine::o_vga_reset() {
-	if (_game & GF_SIMON2) {
-		_lockWord |= 0x8000;
-		vc27_resetSprite();
-		_lockWord &= ~0x8000;
-	} else {
-		_lockWord |= 0x4000;
-		vc27_resetSprite();
-		_lockWord &= ~0x4000;
-	}
+	_lockWord |= 0x8000;
+	vc27_resetSprite();
+	_lockWord &= ~0x8000;
 }
 
 bool SimonEngine::itemIsSiblingOf(uint16 a) {

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- vga.cpp	18 Oct 2005 01:30:22 -0000	1.140
+++ vga.cpp	23 Oct 2005 11:17:15 -0000	1.141
@@ -225,9 +225,9 @@
 	// Simon1 Only
 	if (_vgaRes328Loaded == true) {
 		_vgaRes328Loaded = false;
-		_lockWord |= 0x4000;
+		_lockWord |= 0x8000;
 		read_vga_from_datfile_1(23);
-		_lockWord &= ~0x4000;
+		_lockWord &= ~0x8000;
 	}
 }
 
@@ -235,9 +235,9 @@
 	// Simon1 Only
 	if (_vgaRes328Loaded == false) {
 		_vgaRes328Loaded = true;
-		_lockWord |= 0x4000;
+		_lockWord |= 0x8000;
 		read_vga_from_datfile_1(328);
-		_lockWord &= ~0x4000;
+		_lockWord &= ~0x8000;
 	}
 }
 
@@ -866,7 +866,7 @@
 		} while (++w != state.draw_width);
 
 		/* vc10_helper_5 */
-	} else if (_lockWord & 0x20 && state.palette == 0 || state.palette == 0xC0) {
+	} else if (((_lockWord & 0x20) && state.palette == 0) || state.palette == 0xC0) {
 		const byte *src;
 		byte *dst;
 		uint h, i;