[Scummvm-cvs-logs] SF.net SVN: scummvm: [20914] scummvm/trunk/engines/lure

[eriktorbjorn at users.sourceforge.net]

Revision: 20914
Author:   eriktorbjorn
Date:     2006-02-26 05:43:50 -0800 (Sun, 26 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20914&view=rev

Log Message:
-----------
Cleaned up my earlier "delay in busy-wait loop" commit, and added a similar
delay to PopupMenu::Show().

Modified Paths:
--------------
    scummvm/trunk/engines/lure/events.cpp
    scummvm/trunk/engines/lure/events.h
    scummvm/trunk/engines/lure/lure.cpp
    scummvm/trunk/engines/lure/menu.cpp
Modified: scummvm/trunk/engines/lure/events.cpp
===================================================================
--- scummvm/trunk/engines/lure/events.cpp	2006-02-26 13:02:34 UTC (rev 20913)
+++ scummvm/trunk/engines/lure/events.cpp	2006-02-26 13:43:50 UTC (rev 20914)
@@ -32,7 +32,7 @@
 	return *int_mouse; 
 }
 
-Mouse::Mouse(OSystem &system) : _system(system) {
+Mouse::Mouse() {
 	int_mouse = this;
 
 	_lButton = false; 
@@ -99,11 +99,12 @@
 }
 
 void Mouse::waitForRelease() {
+	OSystem &system = System::getReference();
 	Events &e = Events::getReference();
 
 	do {
 		e.pollEvent();
-		_system.delayMillis(20);
+		system.delayMillis(20);
 	} while (!e.quitFlag && (lButton() || rButton()));
 }
 
@@ -111,7 +112,7 @@
 
 static Events *int_events = NULL;
 
-Events::Events(OSystem &system) : _system(system) {
+Events::Events() {
 	int_events = this;
 	quitFlag = false;
 }
@@ -148,6 +149,7 @@
 }
 
 void Events::waitForPress() {
+	OSystem &system = System::getReference();
 	bool keyButton = false;
 	while (!keyButton) {
 		if (pollEvent()) {
@@ -159,7 +161,7 @@
 				Mouse::getReference().waitForRelease();				
 			}
 		}
-		_system.delayMillis(20);
+		system.delayMillis(20);
 	}
 }
 

Modified: scummvm/trunk/engines/lure/events.h
===================================================================
--- scummvm/trunk/engines/lure/events.h	2006-02-26 13:02:34 UTC (rev 20913)
+++ scummvm/trunk/engines/lure/events.h	2006-02-26 13:43:50 UTC (rev 20914)
@@ -32,12 +32,11 @@
 
 class Mouse {
 private:
-	OSystem &_system;
 	uint8 _cursorNum;
 	int16 _x, _y;
 	bool _lButton, _rButton;
 public:
-	Mouse(OSystem &system);
+	Mouse();
 	~Mouse();
 	static Mouse &getReference(); 
 	void handleEvent(OSystem::Event event);
@@ -57,12 +56,11 @@
 
 class Events {
 private:
-	OSystem &_system;
 	OSystem::Event _event;
 public:
 	bool quitFlag;
 
-	Events(OSystem &system);
+	Events();
 	static Events &getReference();
 
 	bool pollEvent();

Modified: scummvm/trunk/engines/lure/lure.cpp
===================================================================
--- scummvm/trunk/engines/lure/lure.cpp	2006-02-26 13:02:34 UTC (rev 20913)
+++ scummvm/trunk/engines/lure/lure.cpp	2006-02-26 13:43:50 UTC (rev 20914)
@@ -251,8 +251,8 @@
 	_resources = new Resources();
 	_strings = new StringData();
 	_screen = new Screen(*_system);
-	_mouse = new Mouse(*_system);
-	_events = new Events(*_system);
+	_mouse = new Mouse();
+	_events = new Events();
 	_menu = new Menu();
 	Surface::initialise();
 	_room = new Room();

Modified: scummvm/trunk/engines/lure/menu.cpp
===================================================================
--- scummvm/trunk/engines/lure/menu.cpp	2006-02-26 13:02:34 UTC (rev 20913)
+++ scummvm/trunk/engines/lure/menu.cpp	2006-02-26 13:43:50 UTC (rev 20914)
@@ -412,6 +412,7 @@
 				break;
 			}
 		}
+		system.delayMillis(20);
 	}
 
 	mouse.setPosition(oldX, oldY);