From 4ce697e2c38dd96eee13a793402d2946f89d856b Mon Sep 17 00:00:00 2001 From: Walter van Niftrik Date: Sat, 19 Mar 2016 14:20:48 +0100 Subject: ADL: Rename IDI_NONE to IDI_ANY --- engines/adl/adl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/adl/adl.cpp') diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp index b3ac12d8e6..9bd22f89c3 100644 --- a/engines/adl/adl.cpp +++ b/engines/adl/adl.cpp @@ -448,14 +448,14 @@ void AdlEngine::takeItem(byte noun) { } if (item->state == IDI_ITEM_DROPPED) { - item->room = IDI_NONE; + item->room = IDI_ANY; return; } Common::Array::const_iterator pic; for (pic = item->roomPictures.begin(); pic != item->roomPictures.end(); ++pic) { if (matchesCurrentPic(*pic)) { - item->room = IDI_NONE; + item->room = IDI_ANY; item->state = IDI_ITEM_DROPPED; return; } @@ -469,7 +469,7 @@ void AdlEngine::dropItem(byte noun) { Common::Array::iterator item; for (item = _state.items.begin(); item != _state.items.end(); ++item) { - if (item->noun != noun || item->room != IDI_NONE) + if (item->noun != noun || item->room != IDI_ANY) continue; item->room = _state.room; @@ -905,7 +905,7 @@ int AdlEngine::o1_listInv(ScriptEnv &e) { Common::Array::const_iterator item; for (item = _state.items.begin(); item != _state.items.end(); ++item) - if (item->room == IDI_NONE) + if (item->room == IDI_ANY) printMessage(item->description); return 0; -- cgit v1.2.3