From 27d7ae56a629f308e605b97988f4ed4d8e0a22bc Mon Sep 17 00:00:00 2001
From: uruk
Date: Fri, 16 Aug 2013 23:29:03 +0200
Subject: AVALANCHE: Repair Lucerna::verte().

---
 engines/avalanche/lucerna2.cpp | 40 ++++++++++++++++++++--------------------
 engines/avalanche/lucerna2.h   |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'engines/avalanche')

diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 8dfb78ab8c..5762b76441 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -924,55 +924,55 @@ void Lucerna::objectlist() {
 		}
 }
 
-void Lucerna::verte() {
-	byte what;
-
+void Lucerna::verte(Common::Point cursorPos) {
 	if (! _vm->_gyro->dna.user_moves_avvy) 
 		return;
 
+	cursorPos.y /= 2;
+	byte what;
 
-	/* _vm->_trip->tr[0] : that's the only one we're interested in here */
-	if (_vm->_gyro->mx < _vm->_trip->tr[0].x) 
+	// _vm->_trip->tr[0] : that's the only one we're interested in here. (It's Avalot.)
+	if (cursorPos.x < _vm->_trip->tr[0].x) 
 		what = 1;
-	else if (_vm->_gyro->mx > (unsigned char)(_vm->_trip->tr[0].x + _vm->_trip->tr[0]._info.xl)) 
+	else if (cursorPos.x > (_vm->_trip->tr[0].x + _vm->_trip->tr[0]._info.xl)) 
 		what = 2;
 	else
-		what = 0; /* On top */
+		what = 0; // On top
 
-	if (_vm->_gyro->my < _vm->_trip->tr[0].y)
+	if (cursorPos.y < _vm->_trip->tr[0].y)
 		what += 3;
-	else if (_vm->_gyro->my > (unsigned char)(_vm->_trip->tr[0].y + _vm->_trip->tr[0]._info.yl))
+	else if (cursorPos.y > (_vm->_trip->tr[0].y + _vm->_trip->tr[0]._info.yl))
 		what += 6;
 
 	switch (what) {
 	case 0:
 		_vm->_trip->stopwalking();
-		break; /* Clicked on Avvy- no movement */
+		break; // Clicked on Avvy: no movement.
 	case 1:
-		_vm->_trip->rwsp(1, _vm->_trip->left);
+		_vm->_trip->rwsp(0, _vm->_trip->left);
 		break;
 	case 2:
-		_vm->_trip->rwsp(1, _vm->_trip->right);
+		_vm->_trip->rwsp(0, _vm->_trip->right);
 		break;
 	case 3:
-		_vm->_trip->rwsp(1, _vm->_trip->up);
+		_vm->_trip->rwsp(0, _vm->_trip->up);
 		break;
 	case 4:
-		_vm->_trip->rwsp(1, _vm->_trip->ul);
+		_vm->_trip->rwsp(0, _vm->_trip->ul);
 		break;
 	case 5:
-		_vm->_trip->rwsp(1, _vm->_trip->ur);
+		_vm->_trip->rwsp(0, _vm->_trip->ur);
 		break;
 	case 6:
-		_vm->_trip->rwsp(1, _vm->_trip->down);
+		_vm->_trip->rwsp(0, _vm->_trip->down);
 		break;
 	case 7:
-		_vm->_trip->rwsp(1, _vm->_trip->dl);
+		_vm->_trip->rwsp(0, _vm->_trip->dl);
 		break;
 	case 8:
-		_vm->_trip->rwsp(1, _vm->_trip->dr);
+		_vm->_trip->rwsp(0, _vm->_trip->dr);
 		break;
-	}    /* no other values are possible... */
+	}    // No other values are possible.
 
 	showrw();
 }
@@ -995,7 +995,7 @@ void Lucerna::checkclick() {
 	else if (!_vm->_gyro->ddmnow) { // Dropdown can handle its own pointers.
 		if (holdLeftMouse) {
 			_vm->_gyro->newpointer(7); // Mark's crosshairs
-			verte(); // Normally, if you click on the picture, you're guiding Avvy around.
+			verte(cursorPos); // Normally, if you click on the picture, you're guiding Avvy around.
 		} else
 			_vm->_gyro->newpointer(4); // fletch
 	}
diff --git a/engines/avalanche/lucerna2.h b/engines/avalanche/lucerna2.h
index b422f74c39..840c69042f 100644
--- a/engines/avalanche/lucerna2.h
+++ b/engines/avalanche/lucerna2.h
@@ -154,7 +154,7 @@ private:
 
 	void topcheck();
 
-	void verte();
+	void verte(Common::Point cursorPos);
 
 	int8 fades(int8 x);
 
-- 
cgit v1.2.3