diff options
| author | Tobias Gunkel | 2012-01-07 18:05:42 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:28:18 +0100 |
| commit | b01f601d7e8dc0b7885ff058c8596dc2ad6762f4 (patch) | |
| tree | 798ae101fdd6c78a3d531cc9ce58396d8e3f5b38 /engines/scumm/script_v0.cpp | |
| parent | 6b5abf69190b47dc7c0da63fa08a717adbfc0cdd (diff) | |
| download | scummvm-rg350-b01f601d7e8dc0b7885ff058c8596dc2ad6762f4.tar.gz scummvm-rg350-b01f601d7e8dc0b7885ff058c8596dc2ad6762f4.tar.bz2 scummvm-rg350-b01f601d7e8dc0b7885ff058c8596dc2ad6762f4.zip | |
SCUMM: use constants for c64 actor miscflags
Diffstat (limited to 'engines/scumm/script_v0.cpp')
| -rw-r--r-- | engines/scumm/script_v0.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp index 14df89b28d..0f9fbc6e6f 100644 --- a/engines/scumm/script_v0.cpp +++ b/engines/scumm/script_v0.cpp @@ -542,16 +542,16 @@ void ScummEngine_v0::o_loadRoom() { } void ScummEngine_v0::o_loadRoomWithEgo() { - Actor *a; + ActorC64 *a; int obj, room, x, y, dir; obj = fetchScriptByte(); room = fetchScriptByte(); - a = derefActor(VAR(VAR_EGO), "o_loadRoomWithEgo"); + a = (ActorC64 *)derefActor(VAR(VAR_EGO), "o_loadRoomWithEgo"); //0x634F - if (((ActorC64 *)a)->_miscflags & 0x40) { + if (a->_miscflags & kActorMiscFlagFreeze) { // TODO: Check if this is the correct function // to be calling here stopObjectCode(); @@ -734,9 +734,9 @@ void ScummEngine_v0::o_setActorBitVar() { a->_miscflags &= ~mask; // This flag causes the actor to stop moving (used by script #158, Green Tentacle 'Oomph!') - if (a->_miscflags & 0x40) + if (a->_miscflags & kActorMiscFlagFreeze) a->stopActorMoving(); - if (a->_miscflags & 0x80) + if (a->_miscflags & kActorMiscFlagHide) a->setActorCostume(0); debug(0, "o_setActorBitVar(%d, %d, %d)", act, mask, mod); |