5 files changed, 5 insertions, 28 deletions

diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index 63a0d9c127..10c8e328c9 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -745,6 +745,7 @@ byte *Cutaway::handleAnimation(byte *ptr, CutawayObject &object) {
 				// XXX loadnoplay=1;
 				// XXX playsong(abs(OBJ_ANIM[J][11]));
 				// XXX loadnoplay=0;
+				warning("Cutaway::handleAnimation() song %d not handled", ABS(objAnim[i].song));
 			}
 
 		} // for()
diff --git a/queen/display.cpp b/queen/display.cpp
index 8bc7862606..cb9f3b9132 100644
--- a/queen/display.cpp
+++ b/queen/display.cpp
@@ -154,7 +154,7 @@ void Display::palSet(const uint8 *pal, int start, int end, bool updateScreen) {
 	_system->set_palette(tempPal + start * 4, start, end - start + 1);
 	if (updateScreen) {
 		_system->update_screen();
-		waitForTimer();
+		_vm->input()->delay(20);
 	}
 }
 
@@ -613,7 +613,6 @@ void Display::update(bool dynalum, int16 dynaX, int16 dynaY) {
 		debug(7, "Display::update() - Dirtyblocks blit (%d)", count);
 	}
 	_system->update_screen();
-	waitForTimer();
 }
 
 void Display::setupPanel() {
@@ -768,17 +767,6 @@ void Display::setDirtyBlock(uint16 x, uint16 y, uint16 w, uint16 h) {
 	}
 }
 
-void Display::handleTimer() {
-	_gotTick = true;
-}
-
-void Display::waitForTimer() {
-	_gotTick = false;
-	while (!_gotTick) {
-		_vm->input()->delay(10);
-	}
-}
-
 void Display::setMouseCursor(uint8 *buf, uint16 w, uint16 h) {
 	assert(w == 14 && h == 14);
 	uint16 size = 14 * 14;
@@ -966,7 +954,7 @@ void Display::blankScreenEffect1() {
 			}
 			_system->copy_rect(buf, 32, x, y, 32, 32);
 			_system->update_screen();
-			waitForTimer();
+			_vm->input()->delay(10);
 		}
 	}
 }
@@ -999,7 +987,7 @@ void Display::blankScreenEffect2() {
 		}
 		_system->copy_rect(buf, SCREEN_W, x, y, 2, 2);
 		_system->update_screen();
-		waitForTimer();		
+		_vm->input()->delay(10);
 	}
 }
 
@@ -1028,7 +1016,7 @@ void Display::blankScreenEffect3() {
 			_system->copy_rect(buf, SCREEN_W, x, y, 2, 2);
 		}
 		_system->update_screen();
-		waitForTimer();
+		_vm->input()->delay(10);
 	}
 }
 
diff --git a/queen/display.h b/queen/display.h
index 2820e6f6a3..fadde56c13 100644
--- a/queen/display.h
+++ b/queen/display.h
@@ -82,9 +82,6 @@ public:
 	void setDirtyBlock(uint16 x, uint16 y, uint16 w, uint16 h);
 	void forceFullRefresh() { _fullRefresh = 2; }
 
-	void handleTimer();
-	void waitForTimer();
-
 	void setMouseCursor(uint8 *buf, uint16 w, uint16 h);
 	void showMouseCursor(bool show);
 
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 61cae4e2e4..2f8d5617da 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -101,7 +101,6 @@ QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
 }
 
 QueenEngine::~QueenEngine() {
-	_timer->removeTimerProc(&timerHandler);
 	delete _bam;
 	delete _resource;
 	delete _bankMan;
@@ -362,13 +361,7 @@ void QueenEngine::initialise(void) {
 	_music = new Music(driver, this);
 	_sound = Sound::giveSound(_mixer, this, _resource->compression());
 	_walk = new Walk(this);
-	_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
 	_saveFileMan = _system->get_savefile_manager();
 }
 
-void QueenEngine::timerHandler(void *ptr) {
-	QueenEngine *vm = (QueenEngine *)ptr;
-	vm->_display->handleTimer();
-}
-
 } // End of namespace Queen
diff --git a/queen/queen.h b/queen/queen.h
index 30673646fb..b7e9da5dbb 100644
--- a/queen/queen.h
+++ b/queen/queen.h
@@ -102,8 +102,6 @@ protected:
 
 	void initialise();
 
-	static void timerHandler(void *ptr);
-
 
 	int _talkSpeed;
 	bool _subtitles;