diff options
| author | Max Horn | 2003-01-01 18:22:41 +0000 |
|---|---|---|
| committer | Max Horn | 2003-01-01 18:22:41 +0000 |
| commit | 535ad0a4cf8fe0325f04a665c4dbf0773f7e66b0 (patch) | |
| tree | 2ddde9bb8c58f1059e6df4278d1720738c152e24 /scumm/script_v6.cpp | |
| parent | 53a8fc24fe6b248234a2e2b5036526097f5a7834 (diff) | |
| download | scummvm-rg350-535ad0a4cf8fe0325f04a665c4dbf0773f7e66b0.tar.gz scummvm-rg350-535ad0a4cf8fe0325f04a665c4dbf0773f7e66b0.tar.bz2 scummvm-rg350-535ad0a4cf8fe0325f04a665c4dbf0773f7e66b0.zip | |
moved Scumm::faceActorToObj to Actor::faceToObject; moved various functions in script.cpp (grouping cutscene/override related stuff)
svn-id: r6317
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 8320058411..8ba698c26e 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1135,10 +1135,11 @@ void Scumm_v6::o6_putActorAtObject() void Scumm_v6::o6_faceActor() { - int act, obj; - obj = pop(); - act = pop(); - faceActorToObj(act, obj); + int obj = pop(); + Actor *a = derefActorSafe(pop(), "o6_faceActor"); + assert(a); + + a->factToObject(obj); } void Scumm_v6::o6_animateActor() |