aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v5.cpp
diff options
context:
space:
mode:
authorMax Horn2003-05-20 20:42:28 +0000
committerMax Horn2003-05-20 20:42:28 +0000
commit1a394aa3c764c8a50def5bb9d8aa1342d962fbdd (patch)
treefc456ba99a56a6b594cc4817807a59531af2ecd2 /scumm/script_v5.cpp
parent410f8b48264ed9fd02f0d18d462d74a67688f9fa (diff)
downloadscummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.tar.gz
scummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.tar.bz2
scummvm-rg350-1a394aa3c764c8a50def5bb9d8aa1342d962fbdd.zip
added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
Diffstat (limited to 'scumm/script_v5.cpp')
-rw-r--r--scumm/script_v5.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 3151a7c4d4..a02c71758f 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1435,7 +1435,7 @@ void Scumm_v5::o5_pickupObject() {
room = _roomResource;
addObjectToInventory(obj, room);
putOwner(obj, VAR(VAR_EGO));
- putClass(obj, 32, 1);
+ putClass(obj, kObjectClassUntouchable, 1);
putState(obj, 1);
removeObjectFromRoom(obj);
clearDrawObjectQueue();
@@ -2637,7 +2637,7 @@ void Scumm_v5::o5_pickupObjectOld() {
addObjectToInventory(obj, _roomResource);
removeObjectFromRoom(obj);
putOwner(obj, VAR(VAR_EGO));
- putClass(obj, 32, 1);
+ putClass(obj, kObjectClassUntouchable, 1);
putState(obj, 1);
clearDrawObjectQueue();
runHook(1);