AVALANCHE: Repair Gyro::whereis indexes.

5 files changed, 17 insertions, 17 deletions

diff --git a/engines/avalanche/enid2.cpp b/engines/avalanche/enid2.cpp
index ee37cc7dfc..9841fa02e7 100644
--- a/engines/avalanche/enid2.cpp
+++ b/engines/avalanche/enid2.cpp
@@ -278,7 +278,7 @@ void Enid::edna_reload() {
 
 	_vm->_lucerna->major_redraw();
 
-	_vm->_gyro->whereis[_vm->_gyro->pavalot] = _vm->_gyro->dna.room;
+	_vm->_gyro->whereis[_vm->_gyro->pavalot - 150] = _vm->_gyro->dna.room;
 
 	_vm->_gyro->alive = true;
 
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 7ed521467d..8512e82e8a 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -373,10 +373,10 @@ void Lucerna::enterroom(byte x, byte ped) {
 	if ((_vm->_gyro->dna.rooms[x] == 0) && (! _vm->_gyro->flagset('S')))
 		points(1);
 
-	_vm->_gyro->whereis[_vm->_gyro->pavalot] = _vm->_gyro->dna.room;
+	_vm->_gyro->whereis[_vm->_gyro->pavalot - 150] = _vm->_gyro->dna.room;
 
 	if (_vm->_gyro->dna.geida_follows)
-		_vm->_gyro->whereis[_vm->_gyro->pgeida] = x;
+		_vm->_gyro->whereis[_vm->_gyro->pgeida - 150] = x;
 
 	_vm->_gyro->roomtime = 0;
 
@@ -398,7 +398,7 @@ void Lucerna::enterroom(byte x, byte ped) {
 		if (ped > 0) {
 			if (! _vm->_gyro->dna.talked_to_crapulus) {
 
-				_vm->_gyro->whereis[_vm->_gyro->pcrapulus] = r__outsideyours;
+				_vm->_gyro->whereis[_vm->_gyro->pcrapulus - 150] = r__outsideyours;
 				_vm->_trip->tr[1].init(8, false, _vm->_trip); /* load Crapulus */
 
 				if (_vm->_gyro->dna.rooms[r__outsideyours] == 1) {
@@ -412,7 +412,7 @@ void Lucerna::enterroom(byte x, byte ped) {
 				_vm->_trip->tr[1].call_eachstep = true;
 				_vm->_trip->tr[1].eachstep = _vm->_trip->procface_avvy; /* He always faces Avvy. */
 
-			} else _vm->_gyro->whereis[_vm->_gyro->pcrapulus] = r__nowhere;
+			} else _vm->_gyro->whereis[_vm->_gyro->pcrapulus - 150] = r__nowhere;
 
 			if (_vm->_gyro->dna.crapulus_will_tell) {
 				_vm->_trip->tr[1].init(8, false, _vm->_trip);
@@ -450,14 +450,14 @@ void Lucerna::enterroom(byte x, byte ped) {
 		if (_vm->_gyro->dna.geida_follows)
 			put_geida_at(4, ped);
 		if (_vm->_gyro->dna.cwytalot_gone) {
-			_vm->_gyro->magics[lightred].op = _vm->_gyro->nix;
-			_vm->_gyro->whereis[_vm->_gyro->pcwytalot] = r__nowhere;
+			_vm->_gyro->magics[lightred - 11].op = _vm->_gyro->nix;
+			_vm->_gyro->whereis[_vm->_gyro->pcwytalot - 150] = r__nowhere;
 		} else {
 			if (ped > 0) {
 				_vm->_trip->tr[1].init(4, false, _vm->_trip); /* 4=Cwytalot*/
 				_vm->_trip->tr[1].call_eachstep = true;
 				_vm->_trip->tr[1].eachstep = _vm->_trip->procfollow_avvy_y;
-				_vm->_gyro->whereis[_vm->_gyro->pcwytalot] = r__brummieroad;
+				_vm->_gyro->whereis[_vm->_gyro->pcwytalot - 150] = r__brummieroad;
 
 				if (_vm->_gyro->dna.rooms[r__brummieroad] == 1) { /* First time here... */
 					_vm->_trip->apped(2, 2); /* He appears on the right of the screen... */
@@ -510,14 +510,14 @@ void Lucerna::enterroom(byte x, byte ped) {
 		}
 
 		if (_vm->_gyro->dna.been_tied_up) {
-			_vm->_gyro->whereis[_vm->_gyro->probinhood] = 0;
-			_vm->_gyro->whereis[_vm->_gyro->pfriartuck] = 0;
+			_vm->_gyro->whereis[_vm->_gyro->probinhood - 150] = 0;
+			_vm->_gyro->whereis[_vm->_gyro->pfriartuck - 150] = 0;
 		}
 
 		if (_vm->_gyro->dna.tied_up)
 			_vm->_celer->show_one(2);
 
-		if (! _vm->_gyro->dna.mushroom_growing) 
+		if (!_vm->_gyro->dna.mushroom_growing) 
 			_vm->_celer->show_one(3);
 		_vm->_graphics->refreshBackground();
 	}
@@ -612,7 +612,7 @@ void Lucerna::enterroom(byte x, byte ped) {
 			_vm->_graphics->refreshBackground();
 			_vm->_celer->show_one(4);
 			_vm->_gyro->magics[brown].op = _vm->_gyro->nix;
-			_vm->_gyro->whereis[_vm->_gyro->pjacques] = 0;
+			_vm->_gyro->whereis[_vm->_gyro->pjacques - 150] = 0;
 		}
 		if (ped != 0) {
 			_vm->_celer->show_one(6);
diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp
index 5b0f285811..e17ef72552 100644
--- a/engines/avalanche/timeout2.cpp
+++ b/engines/avalanche/timeout2.cpp
@@ -336,7 +336,7 @@ void Timeout::get_tied_up2() {
 void Timeout::hang_around() {
 	_vm->_trip->tr[1].check_me = false;
 	_vm->_trip->tr[0].init(7, true, _vm->_trip); /* Robin Hood */
-	_vm->_gyro->whereis[_vm->_gyro->probinhood] = r__robins;
+	_vm->_gyro->whereis[_vm->_gyro->probinhood - 150] = r__robins;
 	_vm->_trip->apped(1, 2);
 	_vm->_visa->dixi('q', 39);
 	_vm->_trip->tr[0].walkto(7);
@@ -347,7 +347,7 @@ void Timeout::hang_around2() {
 	_vm->_visa->dixi('q', 40);
 	_vm->_trip->tr[1].vanishifstill = false;
 	_vm->_trip->tr[1].walkto(4);
-	_vm->_gyro->whereis[_vm->_gyro->pfriartuck] = r__robins;
+	_vm->_gyro->whereis[_vm->_gyro->pfriartuck - 150] = r__robins;
 	_vm->_visa->dixi('q', 41);
 	_vm->_trip->tr[0].done();
 	_vm->_trip->tr[1].done(); /* Get rid of Robin Hood and Friar Tuck. */
@@ -410,7 +410,7 @@ void Timeout::jacques_wakes_up() {
 	case 3 :  /* Gone through the door. */
 		_vm->_celer->show_one(2); /* Not on the floor, either. */
 		_vm->_celer->show_one(4); /* He's gone... so the door's open. */
-		_vm->_gyro->whereis[_vm->_gyro->pjacques - 1] = 0; /* Gone! */
+		_vm->_gyro->whereis[_vm->_gyro->pjacques - 150] = 0; /* Gone! */
 		break;
 	}
 
diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp
index 8762250b57..b478e9b104 100644
--- a/engines/avalanche/trip6.cpp
+++ b/engines/avalanche/trip6.cpp
@@ -910,7 +910,7 @@ void Trip::call_special(uint16 which) {
 			tr[1].walkto(3);
 			tr[1].vanishifstill = true;
 			tr[1].check_me = true; /* One of them must have Check_Me switched on. */
-			_vm->_gyro->whereis[_vm->_gyro->pfriartuck] = 177; /* Not here, then. */
+			_vm->_gyro->whereis[_vm->_gyro->pfriartuck - 150] = 177; /* Not here, then. */
 			_vm->_timeout->set_up_timer(364, _vm->_timeout->prochang_around, _vm->_timeout->reason_hanging_around);
 		}
 		break;
diff --git a/engines/avalanche/visa2.cpp b/engines/avalanche/visa2.cpp
index 182783ee54..b0cabd40e1 100644
--- a/engines/avalanche/visa2.cpp
+++ b/engines/avalanche/visa2.cpp
@@ -281,7 +281,7 @@ void Visa::talkto(byte whom) {
 		dixi('q', 1); // Circular from Cardiff.
 		_vm->_gyro->dna.talked_to_crapulus = true;
 
-		_vm->_gyro->whereis[_vm->_gyro->pcrapulus] = 177; // Crapulus walks off.
+		_vm->_gyro->whereis[_vm->_gyro->pcrapulus - 150] = 177; // Crapulus walks off.
 
 		_vm->_trip->tr[1].vanishifstill = true;
 		_vm->_trip->tr[1].walkto(3); // Walks away.