From f95834ca05ae0f3a60e475fdef2fe42f6d2f18d5 Mon Sep 17 00:00:00 2001
From: uruk
Date: Thu, 29 Aug 2013 14:33:05 +0200
Subject: AVALANCHE: Repair "entrance hall" room and everything connected to
 it.

---
 engines/avalanche/acci2.cpp  | 2 +-
 engines/avalanche/gyro2.h    | 2 +-
 engines/avalanche/roomnums.h | 4 ++--
 engines/avalanche/trip6.cpp  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index f4b9686b36..586f2280ab 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -964,7 +964,7 @@ void Acci::opendoor() {   /* so whaddya THINK this does?! */
 				_vm->_trip->call_special(_vm->_gyro->portals[fv].data);
 				break;
 			case _vm->_gyro->mopendoor:
-				_vm->_trip->open_the_door((_vm->_gyro->portals[fv].data) >> 8, (_vm->_gyro->portals[fv].data) & 0x0F, fv);
+				_vm->_trip->open_the_door((_vm->_gyro->portals[fv].data) >> 8, (_vm->_gyro->portals[fv].data) & 0x0F, fv + 9);
 				break;
 			}
 			
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index c3711c57ad..a7ad6b6047 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -72,7 +72,7 @@ struct dnatype { /* here goes... */ /* Ux, uy, & ww now all belong to Trip5 */
 	int16 score; /* your score, of course */
 	int32 pence; /* your current amount of dosh */
 	byte room; /* your current room */
-	char wearing; /* what you're wearing */
+	byte wearing; /* what you're wearing */
 	byte swore; /* number of times you've sworn */
 	byte saves; /* number of times this game has been saved */
 	byte rooms[100]; /* Add one to each every time you enter a room */
diff --git a/engines/avalanche/roomnums.h b/engines/avalanche/roomnums.h
index 3032f71db6..f38c25d0cf 100644
--- a/engines/avalanche/roomnums.h
+++ b/engines/avalanche/roomnums.h
@@ -49,7 +49,7 @@ const byte r__aylesoffice = 16;
 const byte r__argentpub = 19;
 const byte r__brummieroad = 20;
 const byte r__bridge = 21; /*{ ? not sure }*/
-const byte r__entrancehall = 22;
+const byte r__entrancehall = 40;
 const byte r__lustiesroom = 23;
 const byte r__westhall = 25;
 const byte r__easthall = 26;
@@ -59,7 +59,7 @@ const byte r__catacombs = 29;
 
 //{ -------------- }
 
-const byte r__lusties = 40;
+const byte r__lusties = 22;
 const byte r__robins = 42;
 const byte r__outsidenottspub = 46;
 const byte r__nottspub = 47;
diff --git a/engines/avalanche/trip6.cpp b/engines/avalanche/trip6.cpp
index b478e9b104..e5a110f6eb 100644
--- a/engines/avalanche/trip6.cpp
+++ b/engines/avalanche/trip6.cpp
@@ -1055,7 +1055,7 @@ void Trip::open_the_door(byte whither, byte ped, byte magicnum) {
 				return;
 			} else {
 				apped(1, 6);
-				tr[1].face = right; /* added by TT 12/3/1995 */
+				tr[0].face = right; /* added by TT 12/3/1995 */
 				_vm->_sequence->first_show(8);
 				_vm->_sequence->then_show(9);
 			}
@@ -1523,7 +1523,7 @@ void Trip::fliproom(byte room, byte ped) {
 		return;
 	}
 
-	if ((ped == 177) && (_vm->_gyro->dna.room == r__lusties)) {
+	if ((room == 177) && (_vm->_gyro->dna.room == r__lusties)) {
 		hide_in_the_cupboard();
 		return;
 	}
-- 
cgit v1.2.3