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_v2.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/adl/adl_v2.cpp')

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;
 		}
 
-- 
cgit v1.2.3