From eaf6ecb7cdf3e372f143a4d9e7c89e89df508862 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 15 Sep 2013 17:17:40 +0200
Subject: AVALANCHE: Fix indexes used by kQuasipeds (Pascal -> C)

---
 engines/avalanche/gyro.cpp    | 33 +++++++++++++++++----------------
 engines/avalanche/scrolls.cpp |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/engines/avalanche/gyro.cpp b/engines/avalanche/gyro.cpp
index 5cc877d99c..defa9f9e0c 100644
--- a/engines/avalanche/gyro.cpp
+++ b/engines/avalanche/gyro.cpp
@@ -113,22 +113,23 @@ const char Gyro::kSpludwicksOrder[3] = {kObjectOnion, kObjectInk, kObjectMushroo
 // 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 that to context.
 const QuasipedType Gyro::kQuasipeds[16] = {
-	{2, kColorLightgray, 19, kColorBrown, kPeopleDogfood}, // A: Dogfood (screen 19).
-	{3, kColorGreen, 19, kColorWhite, kPeopleIbythneth}, // B: Ibythneth (screen 19).
-	{3, kColorWhite, 1, kColorMagenta, kPeopleArkata}, // C: Arkata (screen 1).
-	{3, kColorBlack, 23, kColorRed, 177}, // D: Hawk (screen 23).
-	{3, kColorLightgreen, 50, kColorBrown, kPeopleTrader}, // E: Trader (screen 50).
-	{6, kColorYellow, 42, kColorRed, kPeopleAvalot}, // F: Avvy, tied up (scr.42)
-	{2, kColorBlue, 16, kColorWhite, kPeopleAyles}, // G: Ayles (screen 16).
-	{2, kColorBrown, 7, kColorWhite, kPeopleJacques}, // H: Jacques (screen 7).
-	{2, kColorLightgreen, 47, kColorGreen, kPeopleSpurge}, // I: Spurge (screen 47).
-	{3, kColorYellow, 47, kColorRed, kPeopleAvalot}, // J: Avalot (screen 47).
-	{2, kColorLightgray, 23, kColorBlack, kPeopleDuLustie}, // K: du Lustie (screen 23).
-	{2, kColorYellow, 27, kColorRed, kPeopleAvalot}, // L: Avalot (screen 27).
-	{3, kColorWhite, 27, kColorRed, 177}, // M: Avaroid (screen 27).
-	{4, kColorLightgray, 19, kColorDarkgray, kPeopleMalagauche}, // N: Malagauche (screen 19).
-	{5, kColorLightmagenta, 47, kColorRed, kPeoplePort}, // O: Port (screen 47).
-	{2, kColorLightgreen, 51, kColorDarkgray, kPeopleDrDuck} // P: Duck (screen 51).
+//	_whichPed, _foregroundColor, _room, _backgroundColor, _who
+	{1, kColorLightgray, 19, kColorBrown, kPeopleDogfood}, // A: Dogfood (screen 19).
+	{2, kColorGreen, 19, kColorWhite, kPeopleIbythneth}, // B: Ibythneth (screen 19).
+	{2, kColorWhite, 1, kColorMagenta, kPeopleArkata}, // C: Arkata (screen 1).
+	{2, kColorBlack, 23, kColorRed, 177}, // D: Hawk (screen 23).
+	{2, kColorLightgreen, 50, kColorBrown, kPeopleTrader}, // E: Trader (screen 50).
+	{5, kColorYellow, 42, kColorRed, kPeopleAvalot}, // F: Avvy, tied up (scr.42)
+	{1, kColorBlue, 16, kColorWhite, kPeopleAyles}, // G: Ayles (screen 16).
+	{1, kColorBrown, 7, kColorWhite, kPeopleJacques}, // H: Jacques (screen 7).
+	{1, kColorLightgreen, 47, kColorGreen, kPeopleSpurge}, // I: Spurge (screen 47).
+	{2, kColorYellow, 47, kColorRed, kPeopleAvalot}, // J: Avalot (screen 47).
+	{1, kColorLightgray, 23, kColorBlack, kPeopleDuLustie}, // K: du Lustie (screen 23).
+	{1, kColorYellow, 27, kColorRed, kPeopleAvalot}, // L: Avalot (screen 27).
+	{2, kColorWhite, 27, kColorRed, 177}, // M: Avaroid (screen 27).
+	{3, kColorLightgray, 19, kColorDarkgray, kPeopleMalagauche}, // N: Malagauche (screen 19).
+	{4, kColorLightmagenta, 47, kColorRed, kPeoplePort}, // O: Port (screen 47).
+	{1, kColorLightgreen, 51, kColorDarkgray, kPeopleDrDuck} // P: Duck (screen 51).
 };
 
 const char Gyro::kMusicKeys[] = "QWERTYUIOP[]";
diff --git a/engines/avalanche/scrolls.cpp b/engines/avalanche/scrolls.cpp
index 0390ecaa98..3ecec3c83b 100644
--- a/engines/avalanche/scrolls.cpp
+++ b/engines/avalanche/scrolls.cpp
@@ -678,7 +678,7 @@ void Scrolls::callScrollDriver() {
 					// Quasi-peds. (This routine performs the same
 					// thing with QPs as triptype.chatter does with the
 					// sprites.)
-					PedType *quasiPed = &_vm->_gyro->_peds[_vm->_gyro->kQuasipeds[_param - 10]._whichPed - 1];
+					PedType *quasiPed = &_vm->_gyro->_peds[_vm->_gyro->kQuasipeds[_param - 10]._whichPed];
 					_vm->_gyro->_talkX = quasiPed->_x;
 					_vm->_gyro->_talkY = quasiPed->_y; // Position.
 
-- 
cgit v1.2.3