[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.119,1.120

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Enable missing code


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- simon.cpp	12 Dec 2002 11:07:01 -0000	1.119
+++ simon.cpp	14 Dec 2002 15:35:32 -0000	1.120
@@ -2037,9 +2037,9 @@
 
 	_lock_word |= 0x20;
 
-//  while ((*(volatile uint16*)&_lock_word) & 2) {
-//    delay(10);
-//  }
+	while ((*(volatile uint16*)&_lock_word) & 2) {
+		delay(10);
+	}
 
 	unlock();
 
@@ -2659,27 +2659,23 @@
 		if (!(_game & GAME_SIMON2)) {
 			expire_vga_timers();
 			expire_vga_timers();
+			_sync_flag_2 ^= 1;
 			_cepe_flag ^= 1;
 			if (!_cepe_flag)
 				expire_vga_timers();
 
-			_sync_flag_2 ^= 1;
 		} else {
 			_sync_flag_2 ^= 1;
 
 			if (!_sync_flag_2)
 				expire_vga_timers();
 
-			if (_lock_counter != 0 && !_sync_flag_2) {
-				_lock_word &= ~2;
-				return;
-			}
 		}
 
-//    if (_lock_counter !=0 && _sync_flag_2==1) {
-//      printf("skipping draw...\n");
-//      goto get_out;
-//    }
+		if (_lock_counter != 0 && !_sync_flag_2) {
+			_lock_word &= ~2;
+			return;
+		}
 	}
 
 	timer_vga_sprites();
@@ -2718,9 +2714,9 @@
 		_sync_flag_2 = true;
 		_timer_5--;
 	} else {
-//    start = timeGetTime();
+//    start = _system->get_msecs();
 		timer_proc1();
-//    end = timeGetTime();
+//    end = _system->get_msecs();
 
 //    if (start + 45 < end) {
 //      _timer_5 = (uint16)( (end - start) / 45);