diff options
| author | Matthew Hoops | 2012-08-28 16:50:15 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-28 16:50:15 -0400 |
| commit | f61146f32791831211c7b9399ec681aed109f03b (patch) | |
| tree | 7aa7e8d749448f06427cce963ba088e2f9d71716 /engines/pegasus/neighborhood/mars | |
| parent | 81e7c9a0c1599786a1aeb73d243609a2d280335f (diff) | |
| download | scummvm-rg350-f61146f32791831211c7b9399ec681aed109f03b.tar.gz scummvm-rg350-f61146f32791831211c7b9399ec681aed109f03b.tar.bz2 scummvm-rg350-f61146f32791831211c7b9399ec681aed109f03b.zip | |
PEGASUS: Remove g_allItems global construction
Diffstat (limited to 'engines/pegasus/neighborhood/mars')
| -rw-r--r-- | engines/pegasus/neighborhood/mars/mars.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp index 8c1098a73d..9cc8ab63d4 100644 --- a/engines/pegasus/neighborhood/mars/mars.cpp +++ b/engines/pegasus/neighborhood/mars/mars.cpp @@ -1632,7 +1632,7 @@ void Mars::activateHotspots() { case MakeRoomView(kMars56, kEast): switch (getCurrentActivation()) { case kActivateReactorReadyForNitrogen: - item = (InventoryItem *)g_allItems.findItemByID(kNitrogenCanister); + item = (InventoryItem *)_vm->getAllItems().findItemByID(kNitrogenCanister); if (item->getItemState() != kNitrogenFull) _vm->getAllHotspots().deactivateOneHotspot(kMars57DropNitrogenSpotID); // Fall through... @@ -2151,7 +2151,7 @@ void Mars::receiveNotification(Notification *notification, const NotificationFla } break; case kMarsTurnOnPod: - item = (InventoryItem *)g_allItems.findItemByID(kMarsCard); + item = (InventoryItem *)_vm->getAllItems().findItemByID(kMarsCard); _vm->addItemToInventory(item); GameState.setScoringTurnedOnTransport(); loadLoopSound1(""); @@ -2259,7 +2259,7 @@ void Mars::receiveNotification(Notification *notification, const NotificationFla GameState.setMarsLockFrozen(false); break; case kMars57FreezeLock: - item = (InventoryItem *)g_allItems.findItemByID(kNitrogenCanister); + item = (InventoryItem *)_vm->getAllItems().findItemByID(kNitrogenCanister); item->setItemState(kNitrogenEmpty); _vm->addItemToInventory(item); setCurrentActivation(kActivateReactorReadyForCrowBar); @@ -2271,7 +2271,7 @@ void Mars::receiveNotification(Notification *notification, const NotificationFla _utilityFuse.lightFuse(); break; case kMars57BreakLock: - item = (InventoryItem *)g_allItems.findItemByID(kCrowbar); + item = (InventoryItem *)_vm->getAllItems().findItemByID(kCrowbar); _vm->addItemToInventory(item); GameState.setScoringUsedCrowBar(); GameState.setMarsLockBroken(true); |