From e05a7899755011f860f2b09ce6d5b4e0a15107b9 Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Tue, 25 Mar 2014 19:57:21 +0100
Subject: ILLUSIONS: More work on BBDOU specific code (cursor, bubble)

- Add input handling code
---
 engines/illusions/illusions.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'engines/illusions/illusions.cpp')

diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp
index a59c568c8b..cf40801fff 100644
--- a/engines/illusions/illusions.cpp
+++ b/engines/illusions/illusions.cpp
@@ -213,23 +213,9 @@ bool IllusionsEngine::hasFeature(EngineFeature f) const {
 
 void IllusionsEngine::updateEvents() {
 	Common::Event event;
-
 	while (_eventMan->pollEvent(event)) {
+		_input->processEvent(event);
 		switch (event.type) {
-		case Common::EVENT_KEYDOWN:
-			break;
-		case Common::EVENT_KEYUP:
-			break;
-		case Common::EVENT_MOUSEMOVE:
-  			break;
-		case Common::EVENT_LBUTTONDOWN:
-  			break;
-		case Common::EVENT_LBUTTONUP:
-  			break;
-		case Common::EVENT_RBUTTONDOWN:
-  			break;
-		case Common::EVENT_RBUTTONUP:
-  			break;
 		case Common::EVENT_QUIT:
 			quitGame();
 			break;
@@ -240,7 +226,9 @@ void IllusionsEngine::updateEvents() {
 }
 
 Common::Point *IllusionsEngine::getObjectActorPositionPtr(uint32 objectId) {
-	// TODO Dummy, to be replaced later
+	Control *control = _dict->getObjectControl(objectId);
+	if (control && control->_actor)
+		return &control->_actor->_position;
 	return 0;
 }
 
@@ -296,6 +284,7 @@ int IllusionsEngine::updateGraphics() {
 	Common::Point panPoint(0, 0);
 
 	uint32 currTime = getCurrentTime();
+	
 	_camera->update(currTime);
 
 	// TODO Move to BackgroundItems class
@@ -312,7 +301,7 @@ int IllusionsEngine::updateGraphics() {
 				panPoint = backgroundItem->_panPoints[i];
 		}
 	}
-	
+
 	// TODO Move to Controls class
 	for (Controls::ItemsIterator it = _controls->_controls.begin(); it != _controls->_controls.end(); ++it) {
 		Control *control = *it;
-- 
cgit v1.2.3