[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.40,1.41 simon.cpp,1.125,1.126

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv26002/simon

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

Some _lock_word corrections


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- items.cpp	17 Dec 2002 14:05:44 -0000	1.40
+++ items.cpp	22 Dec 2002 03:54:51 -0000	1.41
@@ -1498,10 +1498,17 @@
 void SimonState::o_unk_120(uint a)
 {
 	uint16 id = TO_BE_16(a);
-	_lock_word |= 0x4000;
-	_vc_ptr = (byte *)&id;
-	vc_15_wakeup_id();
-	_lock_word &= ~0x4000;
+	if (_game & GAME_SIMON2) {
+		_lock_word |= 0x8000;
+		_vc_ptr = (byte *)&id;
+		vc_15_wakeup_id();
+		_lock_word &= ~0x8000;
+	} else {
+		_lock_word |= 0x4000;
+		_vc_ptr = (byte *)&id;
+		vc_15_wakeup_id();
+		_lock_word &= ~0x4000;
+	}
 }
 
 void SimonState::o_unk_163(uint a)
@@ -1538,10 +1545,10 @@
 	items[0] = TO_BE_16(a);
 	items[1] = TO_BE_16(b);
 
-	_lock_word |= 0x4000;
+	_lock_word |= 0x8000;
 	_vc_ptr = (byte *)&items;
 	vc_60_kill_thread();
-	_lock_word &= ~0x4000;
+	_lock_word &= ~0x8000;
 }
 
 /* OK */

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- simon.cpp	19 Dec 2002 15:46:02 -0000	1.125
+++ simon.cpp	22 Dec 2002 03:54:51 -0000	1.126
@@ -2209,9 +2209,15 @@
 
 void SimonState::o_force_lock()
 {
-	_lock_word |= 0x4000;
-	vc_34_force_lock();
-	_lock_word &= ~0x4000;
+	if (_game & GAME_SIMON2) {
+		_lock_word |= 0x8000;
+		vc_34_force_lock();
+		_lock_word &= ~0x8000;
+	} else {
+		_lock_word |= 0x4000;
+		vc_34_force_lock();
+		_lock_word &= ~0x4000;
+	}
 }
 
 void SimonState::o_save_game()
@@ -2747,9 +2753,15 @@
 
 void SimonState::o_vga_reset()
 {
-	_lock_word |= 0x4000;
-	vc_27_reset();
-	_lock_word &= ~0x4000;
+	if (_game & GAME_SIMON2) {
+		_lock_word |= 0x8000;
+		vc_27_reset();
+		_lock_word &= ~0x8000;
+	} else {
+		_lock_word |= 0x4000;
+		vc_27_reset();
+		_lock_word &= ~0x4000;
+	}	
 }
 
 bool SimonState::vc_maybe_skip_proc_3(uint16 a)