diff options
| author | Littleboy | 2013-11-23 19:10:09 -0500 |
|---|---|---|
| committer | Littleboy | 2013-12-10 01:54:57 -0500 |
| commit | 2279464218ba94eb33792f720573b7889d079815 (patch) | |
| tree | 5235b28b221811b767b669d4fc78adffb5a02ab4 /engines/lastexpress/game/action.cpp | |
| parent | 1314c5c128873804446d10edaaf2f2bb4fbe1def (diff) | |
| download | scummvm-rg350-2279464218ba94eb33792f720573b7889d079815.tar.gz scummvm-rg350-2279464218ba94eb33792f720573b7889d079815.tar.bz2 scummvm-rg350-2279464218ba94eb33792f720573b7889d079815.zip | |
LASTEXPRESS: Rename InventoryItem properties
Diffstat (limited to 'engines/lastexpress/game/action.cpp')
| -rw-r--r-- | engines/lastexpress/game/action.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp index dcb421c979..c6ea6f6c8a 100644 --- a/engines/lastexpress/game/action.cpp +++ b/engines/lastexpress/game/action.cpp @@ -652,7 +652,7 @@ IMPLEMENT_ACTION(setItem) return kSceneInvalid; Inventory::InventoryEntry *entry = getInventory()->get(item); - if (entry->isPresent) + if (entry->inPocket) return kSceneInvalid; entry->location = (ObjectLocation)hotspot.param2; @@ -1335,7 +1335,7 @@ IMPLEMENT_ACTION(firebirdPuzzle) IMPLEMENT_ACTION(openMatchBox) // If the match is already in the inventory, do nothing if (!getInventory()->get(kItemMatch)->location - || getInventory()->get(kItemMatch)->isPresent) + || getInventory()->get(kItemMatch)->inPocket) return kSceneInvalid; getInventory()->addItem(kItemMatch); @@ -1774,7 +1774,7 @@ CursorStyle Action::getCursor(const SceneHotspot &hotspot) const { if (object >= kObjectCompartmentA) return kCursorNormal; - if ((!getInventory()->getSelectedItem() || getInventory()->getSelectedEntry()->manualSelect) + if ((!getInventory()->getSelectedItem() || getInventory()->getSelectedEntry()->floating) && (object != kObject21 || getProgress().eventCorpseMovedFromFloor)) return kCursorHand; else |