Remove pointless delays

svn-id: r14436

2 files changed, 3 insertions, 28 deletions

diff --git a/simon/simon.cpp b/simon/simon.cpp
index 2ea80a082c..480757f77d 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -2459,12 +2459,10 @@ void SimonEngine::o_set_video_mode(uint mode, uint vga_res) {
 	if (mode == 4)
 		vc_29_stop_all_sounds();
 
-	if (_lock_word & 0x10) {
+	if (_lock_word & 0x10)
 		error("o_set_video_mode_ex: _lock_word & 0x10");
-//    _unk21_word_array[a] = b; 
-	} else {
-		set_video_mode(mode, vga_res);
-	}
+
+	set_video_mode_internal(mode, vga_res);
 }
 
 void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
@@ -2568,28 +2566,6 @@ void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
 	}
 }
 
-void SimonEngine::set_video_mode(uint mode, uint vga_res_id) {
-	if (_lock_counter == 0) {
-		lock();
-		if (_lock_word == 0) {
-			_sync_flag_1 = true;
-			while (_sync_flag_1) {
-				delay(10);
-			}
-		}
-	}
-
-	_lock_word |= 0x20;
-
-	while (_lock_word & 2) {
-		delay(10);
-	}
-
-	unlock();
-
-	set_video_mode_internal(mode, vga_res_id);
-}
-
 void SimonEngine::o_fade_to_black() {
 	uint i;
 
diff --git a/simon/simon.h b/simon/simon.h
index 26c456b20e..e3505f2666 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -585,7 +585,6 @@ protected:
 	void handle_verb_clicked(uint verb);
 
 	void o_set_video_mode(uint mode, uint vga_res);
-	void set_video_mode(uint mode, uint vga_res_id);
 	void set_video_mode_internal(uint mode, uint vga_res_id);
 
 	void ensureVgaResLoadedC(uint vga_res);