diff options
| author | Tobias Gunkel | 2012-01-15 20:11:30 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:28:44 +0100 |
| commit | f2309998ffbcb33a96edac7f2959abc534717827 (patch) | |
| tree | 6b084dd891829d1d39abe6301ea2868caa53ffeb /engines/scumm/script.cpp | |
| parent | 6ca91a2be5e2f2ad981e52a5c21ca97ca3dee48d (diff) | |
| download | scummvm-rg350-f2309998ffbcb33a96edac7f2959abc534717827.tar.gz scummvm-rg350-f2309998ffbcb33a96edac7f2959abc534717827.tar.bz2 scummvm-rg350-f2309998ffbcb33a96edac7f2959abc534717827.zip | |
SCUMM: fix debugger for v0
Diffstat (limited to 'engines/scumm/script.cpp')
| -rw-r--r-- | engines/scumm/script.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp index eb0f7bf16a..bc6873edf2 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -1137,7 +1137,7 @@ void ScummEngine_v0::walkToActorOrObject(int object) { _walkToObject = object; _walkToObjectIdx = getObjectIndex(object); - if (OBJECT_V0_TYPE(object) == kObjectTypeActor) { + if (OBJECT_V0_TYPE(object) == kObjectV0TypeActor) { walkActorToActor(VAR(VAR_EGO), OBJECT_V0_NR(object), 4); x = a->getRealPos().x; y = a->getRealPos().y; @@ -1187,8 +1187,8 @@ void ScummEngine_v0::checkAndRunSentenceScript() { // If two objects are involved, at least one must be in the actors inventory if (obj2Nr && - (obj1Type != kObjectTypeFG || _objectOwnerTable[obj1Nr] != VAR(VAR_EGO)) && - (obj2Type != kObjectTypeFG || _objectOwnerTable[obj2Nr] != VAR(VAR_EGO))) + (obj1Type != kObjectV0TypeFG || _objectOwnerTable[obj1Nr] != VAR(VAR_EGO)) && + (obj2Type != kObjectV0TypeFG || _objectOwnerTable[obj2Nr] != VAR(VAR_EGO))) { if (getVerbEntrypoint(st.objectA, kVerbPickUp)) doSentence(kVerbPickUp, st.objectA, 0); |