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/prehistoric | |
| 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/prehistoric')
| -rw-r--r-- | engines/pegasus/neighborhood/prehistoric/prehistoric.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp index dcc00ab651..11e28f072d 100644 --- a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp +++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp @@ -284,7 +284,7 @@ void Prehistoric::turnTo(const DirectionConstant newDirection) { break; case MakeRoomView(kPrehistoric16, kNorth): case MakeRoomView(kPrehistoric21, kWest): - keyCard = g_allItems.findItemByID(kKeyCard); + keyCard = _vm->getAllItems().findItemByID(kKeyCard); if (keyCard->getItemState() == kFlashlightOff) { keyCard->setItemState(kFlashlightOn); playSpotSoundSync(kPrehistoricFlashlightClickIn, kPrehistoricFlashlightClickOut); @@ -294,7 +294,7 @@ void Prehistoric::turnTo(const DirectionConstant newDirection) { case MakeRoomView(kPrehistoric16, kWest): case MakeRoomView(kPrehistoric21, kNorth): case MakeRoomView(kPrehistoric21, kSouth): - keyCard = g_allItems.findItemByID(kKeyCard); + keyCard = _vm->getAllItems().findItemByID(kKeyCard); if (keyCard->getItemState() == kFlashlightOn) { keyCard->setItemState(kFlashlightOff); playSpotSoundSync(kPrehistoricFlashlightClickIn, kPrehistoricFlashlightClickOut); @@ -356,7 +356,7 @@ void Prehistoric::arriveAt(const RoomID room, const DirectionConstant direction) zoomToVault(); break; case MakeRoomView(kPrehistoric16, kNorth): - keyCard = g_allItems.findItemByID(kKeyCard); + keyCard = _vm->getAllItems().findItemByID(kKeyCard); if (keyCard->getItemState() == kFlashlightOff) { keyCard->setItemState(kFlashlightOn); @@ -383,7 +383,7 @@ void Prehistoric::arriveAt(const RoomID room, const DirectionConstant direction) case MakeRoomView(kPrehistoric19, kNorth): case MakeRoomView(kPrehistoric20, kNorth): case MakeRoomView(kPrehistoric21, kEast): - keyCard = g_allItems.findItemByID(kKeyCard); + keyCard = _vm->getAllItems().findItemByID(kKeyCard); if (keyCard->getItemState() == kFlashlightOn) { keyCard->setItemState(kFlashlightOff); @@ -554,7 +554,7 @@ void Prehistoric::receiveNotification(Notification *notification, const Notifica break; case kPre25EastUnlockingVaultNoLog: case kPre25EastUnlockingVaultWithLog: - _vm->addItemToInventory((InventoryItem *)g_allItems.findItemByID(kJourneymanKey)); + _vm->addItemToInventory((InventoryItem *)_vm->getAllItems().findItemByID(kJourneymanKey)); break; } } |