AVALANCHE: Implement ROOMNUMS.INC.

2 files changed, 119 insertions, 33 deletions

diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index b9f46f54cb..93b788043d 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -31,6 +31,7 @@
 #include "common/system.h"
 #include "common/str.h"
 #include "common/scummsys.h"
+#include "avalanche/roomnums.h"
 
 namespace Avalanche {
 
@@ -493,39 +494,32 @@ namespace Avalanche {
 	const int16 walk = 3;
 	const int16 run = 5;
 
-
-	//	Deal with it later !!!!!!!
-	// 
-	///*$I ROOMNUMS.INC - Room number constants (r__xxx) */
-
-	//const byte whereis[29] =
-	//	/* The Lads */
-	//{   {
-	//		r__yours, /* Avvy */
-	//		r__spludwicks, /* Spludwick */
-	//		r__outsideyours, /* Crapulus */
-	//		r__ducks, /* Duck - r__DucksRoom's not defined yet. */
-	//		r__argentpub, /* Malagauche */
-	//		r__robins, /* Friar Tuck. */
-	//		177, /* Robin Hood - can't meet him at the start. */
-	//		r__brummieroad, /* Cwytalot */
-	//		r__lustiesroom, /* Baron du Lustie. */
-	//		r__outsidecardiffcastle, /* The Duke of Cardiff. */
-	//		r__argentpub, /* Dogfood */
-	//		r__outsideducks, /* Trader */
-	//		r__argentpub, /* Ibythneth */
-	//		r__aylesoffice, /* Ayles */
-	//		r__nottspub, /* Port */
-	//		r__nottspub, /* Spurge */
-	//		r__musicroom, /* Jacques */
-	//		0, 0, 0, 0, 0, 0, 0, 0,
-	//		/* The Lasses */
-	//		r__yours, /* Arkata */
-	//		r__geidas, /* Geida */
-	//		177, /* nobody allocated here! */
-	//		r__wisewomans
-	//	}
-	//}; /* The Wise Woman. */
+	const byte whereis[29] = {
+		/* The Lads */
+			r__yours, /* Avvy */
+			r__spludwicks, /* Spludwick */
+			r__outsideyours, /* Crapulus */
+			r__ducks, /* Duck - r__DucksRoom's not defined yet. */
+			r__argentpub, /* Malagauche */
+			r__robins, /* Friar Tuck. */
+			177, /* Robin Hood - can't meet him at the start. */
+			r__brummieroad, /* Cwytalot */
+			r__lustiesroom, /* Baron du Lustie. */
+			r__outsidecardiffcastle, /* The Duke of Cardiff. */
+			r__argentpub, /* Dogfood */
+			r__outsideducks, /* Trader */
+			r__argentpub, /* Ibythneth */
+			r__aylesoffice, /* Ayles */
+			r__nottspub, /* Port */
+			r__nottspub, /* Spurge */
+			r__musicroom, /* Jacques */
+			0, 0, 0, 0, 0, 0, 0, 0,
+			/* The Lasses */
+			r__yours, /* Arkata */
+			r__geidas, /* Geida */
+			177, /* nobody allocated here! */
+			r__wisewomans
+	}; /* The Wise Woman. */
 
 	/* Art gallery at 2,1; notice about this at 2,2. */
 
diff --git a/engines/avalanche/roomnums.h b/engines/avalanche/roomnums.h
new file mode 100644
index 0000000000..c16fd05fb4
--- /dev/null
+++ b/engines/avalanche/roomnums.h
@@ -0,0 +1,92 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This code is based on the original source code of Lord Avalot d'Argent version 1.3.
+ * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
+ */
+
+#ifndef ROOMNUMS_H
+#define ROOMNUMS_H
+
+#include "common/system.h"
+
+namespace Avalanche {
+
+	namespace Gyro {
+
+	const byte r__nowhere = 0;
+	const byte r__yours = 1;
+	const byte r__outsideyours = 2;
+	/*{ a corridor in your castle. = 3 }
+	{ outside your castle = 5; }*/
+	const byte r__musicroom = 7;
+	const byte r__outsideargentpub = 9;
+	const byte r__argentroad = 10;
+	const byte r__wisewomans = 11;
+	const byte r__spludwicks = 12;
+	const byte r__insideabbey = 13;
+	const byte r__outsideabbey = 14; /*{ assumed }*/
+	const byte r__avvysgarden = 15;
+	const byte r__aylesoffice = 16;
+	const byte r__argentpub = 19;
+	const byte r__brummieroad = 20;
+	const byte r__lusties = 21; /*{ ? not sure }*/
+	const byte r__entrancehall = 22;
+	const byte r__lustiesroom = 23;
+	const byte r__westhall = 25;
+	const byte r__easthall = 26;
+	const byte r__oubliette = 27;
+	const byte r__geidas = 28;
+	const byte r__catacombs = 29;
+
+	//{ -------------- }
+
+	const byte r__bridge = 40;
+	const byte r__robins = 42;
+	const byte r__outsidenottspub = 46;
+	const byte r__nottspub = 47;
+
+	//{ -------------- }
+
+	const byte r__outsideducks = 50;
+	const byte r__ducks = 51;
+
+	//{ -------------- }
+
+	const byte r__outsidecardiffcastle = 70;
+	const byte r__insidecardiffcastle = 71;
+
+	//{ -------------- }
+
+	/*{ place80 appears to be bogus }*/
+
+	//{ -------------- }
+
+	const byte r__bosskey = 98; /*{ assumed }*/
+	const byte r__map = 99;
+
+	} // End of namespace Gyro
+
+} // End of namespace Avalanche
+
+#endif // ROOMNUMS_H