PEGASUS: Remove g_allHotspots global construction

3 files changed, 23 insertions, 21 deletions

diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
index a6806d5c46..6421195c8e 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -1292,42 +1292,42 @@ void Caldoria::activateHotspots() {
 	case kCaldoriaDrawers:
 		if (getCurrentActivation() == kActivateRightOpen) {
 			if (GameState.isTakenItemID(kKeyCard)) {
-				g_allHotspots.activateOneHotspot(kCaldoriaRightDrawerNoKeysCloseSpotID);
-				g_allHotspots.deactivateOneHotspot(kCaldoriaRightDrawerWithKeysCloseSpotID);
+				_vm->getAllHotspots().activateOneHotspot(kCaldoriaRightDrawerNoKeysCloseSpotID);
+				_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaRightDrawerWithKeysCloseSpotID);
 			} else {
-				g_allHotspots.activateOneHotspot(kCaldoriaRightDrawerWithKeysCloseSpotID);
-				g_allHotspots.deactivateOneHotspot(kCaldoriaRightDrawerNoKeysCloseSpotID);
+				_vm->getAllHotspots().activateOneHotspot(kCaldoriaRightDrawerWithKeysCloseSpotID);
+				_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaRightDrawerNoKeysCloseSpotID);
 			}
 		}
 	case kCaldoriaReplicator:
 		if (GameState.getCaldoriaMadeOJ())
-			g_allHotspots.deactivateOneHotspot(kCaldoriaMakeOJSpotID);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaMakeOJSpotID);
 		break;
 	case kCaldoria27:
 		if (GameState.isCurrentDoorOpen()) {
-			g_allHotspots.deactivateOneHotspot(kCaldoriaFourthFloorElevator1);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaFourthFloorElevator2);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaFourthFloorElevator3);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaFourthFloorElevator4);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaFourthFloorElevator5);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaFourthFloorElevator1);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaFourthFloorElevator2);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaFourthFloorElevator3);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaFourthFloorElevator4);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaFourthFloorElevator5);
 		}
 		break;
 	case kCaldoria28:
 		if (GameState.isCurrentDoorOpen()) {
-			g_allHotspots.deactivateOneHotspot(kCaldoriaGroundElevator1);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaGroundElevator2);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaGroundElevator3);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaGroundElevator4);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaGroundElevator5);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaGroundElevator1);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaGroundElevator2);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaGroundElevator3);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaGroundElevator4);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaGroundElevator5);
 		}
 		break;
 	case kCaldoria45:
 		if (GameState.isCurrentDoorOpen()) {
-			g_allHotspots.deactivateOneHotspot(kCaldoriaRoofElevator1);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaRoofElevator2);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaRoofElevator3);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaRoofElevator4);
-			g_allHotspots.deactivateOneHotspot(kCaldoriaRoofElevator5);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaRoofElevator1);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaRoofElevator2);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaRoofElevator3);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaRoofElevator4);
+			_vm->getAllHotspots().deactivateOneHotspot(kCaldoriaRoofElevator5);
 		}
 		break;
 	}
@@ -1576,7 +1576,7 @@ Hotspot *Caldoria::getItemScreenSpot(Item *item, DisplayElement *element) {
 	if (destSpotID == kNoHotSpotID)
 		return Neighborhood::getItemScreenSpot(item, element);
 
-	return g_allHotspots.findHotspotByID(destSpotID);
+	return _vm->getAllHotspots().findHotspotByID(destSpotID);
 }
 
 void Caldoria::pickedUpItem(Item *item) {
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
index d8ac3b08cb..21ad7db955 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include "pegasus/pegasus.h"
 #include "pegasus/ai/ai_area.h"
 #include "pegasus/neighborhood/caldoria/caldoria.h"
 #include "pegasus/neighborhood/caldoria/caldoria4dsystem.h"
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
index 2b70ead442..ff4d1811d0 100644
--- a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "pegasus/gamestate.h"
+#include "pegasus/pegasus.h"
 #include "pegasus/neighborhood/neighborhood.h"
 #include "pegasus/neighborhood/caldoria/caldoria.h"
 #include "pegasus/neighborhood/caldoria/caldoriamirror.h"