AVALANCHE: some more work on variables

5 files changed, 20 insertions, 20 deletions

diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index a54e092d2f..d68d837c2c 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -162,9 +162,6 @@ private:
 #endif
 
 public:
-	static const MouseHotspotType kMouseHotSpots[9];
-	static const int16 kMaxSprites = 2; // Current max no. of sprites.
-
 	// For Thinkabout:
 	static const bool kThing = true;
 	static const bool kPerson = false;
@@ -306,6 +303,7 @@ public:
 	void setRoom(People persId, Room roomId);
 	Room getRoom(People persId);
 private:
+	static const int16 kMaxSprites = 2; // Current max no. of sprites.
 	static Room _whereIs[29];
 
 	// Will be used in dusk() and dawn().
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 5ccb1ca6e6..aa4f73d3ad 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -37,18 +37,6 @@
 
 namespace Avalanche {
 
-const MouseHotspotType AvalancheEngine::kMouseHotSpots[9] = {
-	{8,0}, // 0 - up-arrow
-	{0,0}, // 1 - screwdriver
-	{15,6}, // 2 - right-arrow
-	{0,0}, // 3 - fletch
-	{8,7}, // 4 - hourglass
-	{4,0}, // 5 - TTHand
-	{8,5}, // 6 - Mark's crosshairs
-	{8,7}, // 7 - I-beam
-	{0,0} // 8 - question mark
-};
-
 // Art gallery at 2,1; notice about this at 2,2.
 const int32 AvalancheEngine::kCatacombMap[8][8] = {
 	// Geida's room
diff --git a/engines/avalanche/avalot.h b/engines/avalanche/avalot.h
index 292596b89f..5381edd6cb 100644
--- a/engines/avalanche/avalot.h
+++ b/engines/avalanche/avalot.h
@@ -69,10 +69,6 @@ static const int16 kCarryLimit = 12;  // carry limit
 static const int16 kNumlockCode = 32;  // Code for Num Lock
 static const int16 kMouseSize = 134;
 
-struct MouseHotspotType { // mouse-void
-	int16 _horizontal, _vertical;
-};
-
 struct PedType {
 	int16 _x, _y;
 	Direction _direction;
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index a7d9c3964e..4c398dfd20 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -38,6 +38,18 @@ namespace Avalanche {
 
 const byte GraphicManager::kEgaPaletteIndex[16] = {0, 1, 2, 3, 4, 5, 20, 7, 56, 57, 58, 59, 60, 61, 62, 63};
 
+const MouseHotspotType GraphicManager::kMouseHotSpots[9] = {
+	{8,0}, // 0 - up-arrow
+	{0,0}, // 1 - screwdriver
+	{15,6}, // 2 - right-arrow
+	{0,0}, // 3 - fletch
+	{8,7}, // 4 - hourglass
+	{4,0}, // 5 - TTHand
+	{8,5}, // 6 - Mark's crosshairs
+	{8,7}, // 7 - I-beam
+	{0,0} // 8 - question mark
+};
+
 GraphicManager::GraphicManager(AvalancheEngine *vm) {
 	_vm = vm;
 }
@@ -144,7 +156,7 @@ void GraphicManager::loadMouse(byte which) {
 	mask.free();
 	f.close();
 
-	CursorMan.replaceCursor(cursor.getPixels(), 16, 32, AvalancheEngine::kMouseHotSpots[which]._horizontal, AvalancheEngine::kMouseHotSpots[which]._vertical * 2, 255, false);
+	CursorMan.replaceCursor(cursor.getPixels(), 16, 32, kMouseHotSpots[which]._horizontal, kMouseHotSpots[which]._vertical * 2, 255, false);
 	cursor.free();
 }
 
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index a09552fc91..b3710742ca 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -55,8 +55,14 @@ public:
 	uint16 _size; // The size of one picture.
 };
 
+struct MouseHotspotType { // mouse-void
+	int16 _horizontal, _vertical;
+};
+
 class GraphicManager {
 public:
+	static const MouseHotspotType kMouseHotSpots[9];
+
 	Graphics::Surface _surface;
 	Color _talkBackgroundColor, _talkFontColor;