aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/actor.h3
-rw-r--r--scumm/script_v6.cpp4
-rw-r--r--scumm/script_v8.cpp4
3 files changed, 6 insertions, 5 deletions
diff --git a/scumm/actor.h b/scumm/actor.h
index aa9f9813d5..d94d4364c3 100644
--- a/scumm/actor.h
+++ b/scumm/actor.h
@@ -32,7 +32,8 @@ enum MoveFlags {
MF_NEW_LEG = 1,
MF_IN_LEG = 2,
MF_TURN = 4,
- MF_LAST_LEG = 8
+ MF_LAST_LEG = 8,
+ MF_FROZEN = 0x80
};
struct ActorWalkData {
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index b7ee370756..a1c5c3e5df 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1712,10 +1712,10 @@ void Scumm_v6::o6_actorOps() {
a->turnToDirection(pop());
break;
case 233: /* freeze actor */
- a->moving |= 0x80;
+ a->moving |= MF_FROZEN;
break;
case 234: /* unfreeze actor */
- a->moving &= ~0x7f;
+ a->moving &= ~MF_FROZEN;
break;
case 235: /* talk_script */
a->talk_script = pop();
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index ad1f4e8330..349528d679 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1155,10 +1155,10 @@ void Scumm_v8::o8_actorOps() {
a->talk_script = pop();
break;
case 0x85: // SO_ACTOR_WALK_PAUSE
- a->moving |= 0x80;
+ a->moving |= MF_FROZEN;
break;
case 0x86: // SO_ACTOR_WALK_RESUME
- a->moving &= ~0x7f;
+ a->moving &= ~MF_FROZEN;
break;
case 0x87: // SO_ACTOR_VOLUME Set volume of actor speech
// TODO - implement this!