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

[eriktorbjorn at users.sourceforge.net]

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

Log Message:
-----------
Added delays to the waitForRelease() and waitForPress() busy-wait loops.

Modified Paths:
--------------
    scummvm/trunk/engines/lure/events.cpp
    scummvm/trunk/engines/lure/events.h
    scummvm/trunk/engines/lure/lure.cpp
Modified: scummvm/trunk/engines/lure/events.cpp
===================================================================
--- scummvm/trunk/engines/lure/events.cpp	2006-02-26 12:52:34 UTC (rev 20911)
+++ scummvm/trunk/engines/lure/events.cpp	2006-02-26 13:02:25 UTC (rev 20912)
@@ -32,7 +32,7 @@
 	return *int_mouse; 
 }
 
-Mouse::Mouse() {
+Mouse::Mouse(OSystem &system) : _system(system) {
 	int_mouse = this;
 
 	_lButton = false; 
@@ -103,6 +103,7 @@
 
 	do {
 		e.pollEvent();
+		_system.delayMillis(20);
 	} while (!e.quitFlag && (lButton() || rButton()));
 }
 
@@ -110,7 +111,7 @@
 
 static Events *int_events = NULL;
 
-Events::Events() {
+Events::Events(OSystem &system) : _system(system) {
 	int_events = this;
 	quitFlag = false;
 }
@@ -158,6 +159,7 @@
 				Mouse::getReference().waitForRelease();				
 			}
 		}
+		_system.delayMillis(20);
 	}
 }
 

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

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