diff options
| author | Walter van Niftrik | 2016-03-19 14:20:48 +0100 |
|---|---|---|
| committer | Walter van Niftrik | 2016-06-06 20:35:49 +0200 |
| commit | 4ce697e2c38dd96eee13a793402d2946f89d856b (patch) | |
| tree | 8d6071a1b8e794c51ada9f92591e1f23a32bd7da /engines/adl/adl_v2.cpp | |
| parent | 3f7d5608a9b3cd967c4ceb6fd9bfb5d2e4c19643 (diff) | |
| download | scummvm-rg350-4ce697e2c38dd96eee13a793402d2946f89d856b.tar.gz scummvm-rg350-4ce697e2c38dd96eee13a793402d2946f89d856b.tar.bz2 scummvm-rg350-4ce697e2c38dd96eee13a793402d2946f89d856b.zip | |
ADL: Rename IDI_NONE to IDI_ANY
Diffstat (limited to 'engines/adl/adl_v2.cpp')
| -rw-r--r-- | engines/adl/adl_v2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp index 61077d5aae..3383a6307a 100644 --- a/engines/adl/adl_v2.cpp +++ b/engines/adl/adl_v2.cpp @@ -101,7 +101,7 @@ void AdlEngine_v2::setupOpcodeTables() { } bool AdlEngine_v2::matchesCurrentPic(byte pic) const { - return pic == getCurRoom().curPicture || pic == IDI_NONE; + return pic == getCurRoom().curPicture || pic == IDI_ANY; } int AdlEngine_v2::o2_isFirstTime(ScriptEnv &e) { @@ -155,7 +155,7 @@ int AdlEngine_v2::o2_isCarryingSomething(ScriptEnv &e) { Common::Array<Item>::const_iterator item; for (item = _state.items.begin(); item != _state.items.end(); ++item) - if (item->room == IDI_NONE) + if (item->room == IDI_ANY) return 0; return -1; } @@ -169,7 +169,7 @@ int AdlEngine_v2::o2_moveItem(ScriptEnv &e) { Item &item = getItem(e.arg(1)); // Set items that move from inventory to a room to state "dropped" - if (item.room == IDI_NONE && room != IDI_VOID_ROOM) + if (item.room == IDI_ANY && room != IDI_VOID_ROOM) item.state = IDI_ITEM_DROPPED; item.room = room; @@ -192,7 +192,7 @@ int AdlEngine_v2::o2_moveAllItems(ScriptEnv &e) { for (item = _state.items.begin(); item != _state.items.end(); ++item) if (item->room == room1) { item->room = room2; - if (room1 == IDI_NONE) + if (room1 == IDI_ANY) item->state = IDI_ITEM_DROPPED; } |