AVALANCHE: Add color.h to replace the color constants from the CRT unit of Pascal.

3 files changed, 127 insertions, 78 deletions

diff --git a/engines/avalanche/color.h b/engines/avalanche/color.h
new file mode 100644
index 0000000000..1a8e69da83
--- /dev/null
+++ b/engines/avalanche/color.h
@@ -0,0 +1,56 @@
+/* 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.
+ */
+
+// Color constants replacing the colors from the CRT unit of Pascal
+
+#ifndef COLOR_H
+#define COLOR_H
+
+#include "common/system.h"
+
+namespace Avalanche {
+
+const byte black = 0;
+const byte blue = 1;
+const byte green = 2;
+const byte cyan = 3;
+const byte red = 4;
+const byte magenta = 5;
+const byte brown = 6;
+const byte lightgray = 7;
+const byte darkgray = 8;
+const byte lightblue = 9;
+const byte lightgreen = 10;
+const byte lightcyan = 11;
+const byte lightred = 12;
+const byte lightmagenta = 13;
+const byte yellow = 14;
+const byte white = 15;
+
+} // End of namespace Avalanche
+
+#endif // COLOR_H
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index 93b788043d..db02bc27a5 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -32,6 +32,7 @@
 #include "common/str.h"
 #include "common/scummsys.h"
 #include "avalanche/roomnums.h"
+#include "avalanche/color.h"
 
 namespace Avalanche {
 
@@ -230,7 +231,7 @@ namespace Avalanche {
 
 	struct quasiped_type {
 		byte whichped, fgc, room, bgc;
-		char who;
+		uint16 who;
 	};
 	/* A quasiped defines how people who aren't sprites talk. For example,
 	   quasiped "A" is Dogfood. The rooms aren't stored because I'm leaving
@@ -581,29 +582,25 @@ namespace Avalanche {
 	const bool demo = false; /* If this is true, we're in a demo of the game. */
 
 	const char spludwick_order[3] = {onion, ink, mushroom};
-
-
-	//I need color constants here, like in CRT unit.
-	// 
-	//const quasiped_type quasipeds[16] = {
-	//	{	{2, lightgray, 19, brown, pdogfood},                       /* A: Dogfood (screen 19). */
-	//		{3, green,     19, white, pibythneth},                         /* B: Ibythneth (screen 19). */
-	//		{3, white,     1, magenta, parkata},                        /* C: Arkata (screen 1). */
-	//		{3, black,     23, red, '\261'},                         /* D: Hawk (screen 23). */
-	//		{3, lightgreen, 50, brown, ptrader},                        /* E: Trader (screen 50). */
-	//		{6, yellow,    42, red, pavalot},                           /* F: Avvy, tied up (scr.42) */
-	//		{2, blue,      16, white, payles},                         /* G: Ayles (screen 16). */
-	//		{2, brown,     7, white, pjacques},                          /* H: Jacques (screen 7). */
-	//		{2, lightgreen, 47, green, pspurge},                        /* I: Spurge (screen 47). */
-	//		{3, yellow,    47, red, pavalot},                           /* J: Avalot (screen 47). */
-	//		{2, lightgray, 23, black, pdulustie},                         /* K: du Lustie (screen 23). */
-	//		{2, yellow,    27, red, pavalot},                           /* L: Avalot (screen 27). */
-	//		{3, white,     27, red, '\261'},                         /* M: Avaroid (screen 27). */
-	//		{4, lightgray, 19, darkgray, pmalagauche},                        /*N: Malagauche (screen 19). */
-	//		{5, lightmagenta, 47, red, pport},                           /* O: Port (screen 47). */
-	//		{2, lightgreen, 51, darkgray, pdrduck}
-	//	}
-	//};                         /*P: Duck (screen 51). */
+	 
+	const quasiped_type quasipeds[16] = {
+		{2, lightgray, 19, brown, pdogfood},                       /* A: Dogfood (screen 19). */
+		{3, green,     19, white, pibythneth},                         /* B: Ibythneth (screen 19). */
+		{3, white,     1, magenta, parkata},                        /* C: Arkata (screen 1). */
+		{3, black,     23, red, 177},                         /* D: Hawk (screen 23). */
+		{3, lightgreen, 50, brown, ptrader},                        /* E: Trader (screen 50). */
+		{6, yellow,    42, red, pavalot},                           /* F: Avvy, tied up (scr.42) */
+		{2, blue,      16, white, payles},                         /* G: Ayles (screen 16). */
+		{2, brown,     7, white, pjacques},                          /* H: Jacques (screen 7). */
+		{2, lightgreen, 47, green, pspurge},                        /* I: Spurge (screen 47). */
+		{3, yellow,    47, red, pavalot},                           /* J: Avalot (screen 47). */
+		{2, lightgray, 23, black, pdulustie},                         /* K: du Lustie (screen 23). */
+		{2, yellow,    27, red, pavalot},                           /* L: Avalot (screen 27). */
+		{3, white,     27, red, 177},                         /* M: Avaroid (screen 27). */
+		{4, lightgray, 19, darkgray, pmalagauche},                        /*N: Malagauche (screen 19). */
+		{5, lightmagenta, 47, red, pport},                           /* O: Port (screen 47). */
+		{2, lightgreen, 51, darkgray, pdrduck}
+	};                         /*P: Duck (screen 51). */
 
 	const int16 lower = 0;
 	const int16 same = 1;
diff --git a/engines/avalanche/roomnums.h b/engines/avalanche/roomnums.h
index c16fd05fb4..3c5ee49a51 100644
--- a/engines/avalanche/roomnums.h
+++ b/engines/avalanche/roomnums.h
@@ -32,60 +32,56 @@
 
 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
+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 Avalanche