aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWalter van Niftrik2016-03-18 15:55:20 +0100
committerWalter van Niftrik2016-06-06 20:35:49 +0200
commitfab489c530fb89ce92dcfa0ce62f0ca2f3dcc676 (patch)
treec2aa1671133ccc162ad0a9b123f23df0ce8f0d10
parentddf1151a534cf215cc0ffe972163489c319bdc63 (diff)
downloadscummvm-rg350-fab489c530fb89ce92dcfa0ce62f0ca2f3dcc676.tar.gz
scummvm-rg350-fab489c530fb89ce92dcfa0ce62f0ca2f3dcc676.tar.bz2
scummvm-rg350-fab489c530fb89ce92dcfa0ce62f0ca2f3dcc676.zip
ADL: Rename IDI_ITEM_MOVED to IDI_ITEM_DROPPED
-rw-r--r--engines/adl/adl.cpp8
-rw-r--r--engines/adl/adl.h2
-rw-r--r--engines/adl/adl_v2.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 31c448570c..778d8212be 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -357,7 +357,7 @@ void AdlEngine::drawItems() const {
if (item->room != _state.room)
continue;
- if (item->state == IDI_ITEM_MOVED) {
+ if (item->state == IDI_ITEM_DROPPED) {
if (getCurRoom().picture == getCurRoom().curPicture) {
const Common::Point &p = _itemOffsets[dropped];
drawItem(*item, p);
@@ -444,7 +444,7 @@ void AdlEngine::takeItem(byte noun) {
return;
}
- if (item->state == IDI_ITEM_MOVED) {
+ if (item->state == IDI_ITEM_DROPPED) {
item->room = IDI_NONE;
return;
}
@@ -453,7 +453,7 @@ void AdlEngine::takeItem(byte noun) {
for (pic = item->roomPictures.begin(); pic != item->roomPictures.end(); ++pic) {
if (*pic == getCurRoom().curPicture) {
item->room = IDI_NONE;
- item->state = IDI_ITEM_MOVED;
+ item->state = IDI_ITEM_DROPPED;
return;
}
}
@@ -470,7 +470,7 @@ void AdlEngine::dropItem(byte noun) {
continue;
item->room = _state.room;
- item->state = IDI_ITEM_MOVED;
+ item->state = IDI_ITEM_DROPPED;
return;
}
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index e7c36aefde..d4fe9ed8dc 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -120,7 +120,7 @@ private:
enum {
IDI_ITEM_NOT_MOVED,
- IDI_ITEM_MOVED,
+ IDI_ITEM_DROPPED,
IDI_ITEM_DOESNT_MOVE
};
diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp
index 55ea15dba1..6c6a710a55 100644
--- a/engines/adl/adl_v2.cpp
+++ b/engines/adl/adl_v2.cpp
@@ -117,7 +117,7 @@ int AdlEngine_v2::o2_moveItem(ScriptEnv &e) {
// Set items that move from inventory to a room to state "dropped"
if (item.room == IDI_NONE && room != IDI_VOID_ROOM)
- item.state = IDI_ITEM_MOVED;
+ item.state = IDI_ITEM_DROPPED;
item.room = room;
return 2;