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_v5.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_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 6310f058f5..007c527cc9 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -866,9 +866,14 @@ void Scumm_v5::o5_expression() void Scumm_v5::o5_faceActor() { int act, obj; + Actor *a; act = getVarOrDirectByte(0x80); obj = getVarOrDirectWord(0x40); - faceActorToObj(act, obj); + + a = derefActorSafe(act, "o5_faceActor"); + assert(a); + + a->factToObject(obj); } void Scumm_v5::o5_findInventory() |