diff options
| author | Tobias Gunkel | 2012-01-16 22:32:46 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:28:49 +0100 |
| commit | 347035385e3608c3107db7b9cba0673ce9e03a22 (patch) | |
| tree | 54d5523e3f90cab85ec5c10cd78ccdb00a16f8d9 /engines/scumm/script.cpp | |
| parent | 8141511e2f6eb01a526d6adf3ecf915c656e280c (diff) | |
| download | scummvm-rg350-347035385e3608c3107db7b9cba0673ce9e03a22.tar.gz scummvm-rg350-347035385e3608c3107db7b9cba0673ce9e03a22.tar.bz2 scummvm-rg350-347035385e3608c3107db7b9cba0673ce9e03a22.zip | |
SCUMM: merge object v0 id and type into one object var
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 3fa89b68fb..588ebaffb9 100644 --- a/engines/scumm/script.cpp +++ b/engines/scumm/script.cpp @@ -1138,7 +1138,7 @@ void ScummEngine_v0::walkToActorOrObject(int object) { _walkToObjectIdx = getObjectIndex(object); if (OBJECT_V0_TYPE(object) == kObjectV0TypeActor) { - walkActorToActor(VAR(VAR_EGO), OBJECT_V0_NR(object), 4); + walkActorToActor(VAR(VAR_EGO), OBJECT_V0_ID(object), 4); x = a->getRealPos().x; y = a->getRealPos().y; } else { @@ -1224,14 +1224,14 @@ void ScummEngine_v0::runSentenceScript() { if (getVerbEntrypoint(_cmdObject, _cmdVerb) != 0) { // do not read in the dark if (!(_cmdVerb == kVerbRead && _currentLights == 0)) { - VAR(VAR_ACTIVE_OBJECT2) = OBJECT_V0_NR(_cmdObject2); + VAR(VAR_ACTIVE_OBJECT2) = OBJECT_V0_ID(_cmdObject2); runObjectScript(_cmdObject, _cmdVerb, false, false, NULL); return; } } else { if (_cmdVerb == kVerbGive) { // no "give to"-script: give to other kid or ignore - int actor = OBJECT_V0_NR(_cmdObject2); + int actor = OBJECT_V0_ID(_cmdObject2); if (actor < 8) setOwnerOf(_cmdObject, actor); return; |