diff options
author | Eric Fry | 2018-05-07 08:36:39 +1000 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
commit | 6e09cd7e0899052a927bb65ba13219a4cd53c814 (patch) | |
tree | fdf3492f3a6e4ba8a0cc87f44f7cd8fbdc5d9994 /engines/illusions/sequenceopcodes.cpp | |
parent | c66b2208e0f8aa35288da64ce3903edc5a8205cd (diff) | |
download | scummvm-rg350-6e09cd7e0899052a927bb65ba13219a4cd53c814.tar.gz scummvm-rg350-6e09cd7e0899052a927bb65ba13219a4cd53c814.tar.bz2 scummvm-rg350-6e09cd7e0899052a927bb65ba13219a4cd53c814.zip |
ILLUSIONS: Rename some actor flags
Diffstat (limited to 'engines/illusions/sequenceopcodes.cpp')
-rw-r--r-- | engines/illusions/sequenceopcodes.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/illusions/sequenceopcodes.cpp b/engines/illusions/sequenceopcodes.cpp index c394537607..21152097d9 100644 --- a/engines/illusions/sequenceopcodes.cpp +++ b/engines/illusions/sequenceopcodes.cpp @@ -295,64 +295,64 @@ void SequenceOpcodes::opSetPathCtrY(Control *control, OpCall &opCall) { void SequenceOpcodes::opSetPathWalkPoints(Control *control, OpCall &opCall) { ARG_INT16(pathWalkPointsIndex); BackgroundResource *bgRes = _vm->_backgroundInstances->getActiveBgResource(); - control->_actor->_flags |= Illusions::ACTOR_FLAG_2; + control->_actor->_flags |= Illusions::ACTOR_FLAG_HAS_WALK_POINTS; control->_actor->_pathWalkPoints = bgRes->getPathWalkPoints(pathWalkPointsIndex - 1); } void SequenceOpcodes::opDisableAutoScale(Control *control, OpCall &opCall) { // Keep current scale but don't autoscale - control->_actor->_flags &= ~Illusions::ACTOR_FLAG_4; + control->_actor->_flags &= ~Illusions::ACTOR_FLAG_SCALED; } void SequenceOpcodes::opSetScale(Control *control, OpCall &opCall) { ARG_INT16(scale); - control->_actor->_flags &= ~Illusions::ACTOR_FLAG_4; + control->_actor->_flags &= ~Illusions::ACTOR_FLAG_SCALED; control->setActorScale(scale); } void SequenceOpcodes::opSetScaleLayer(Control *control, OpCall &opCall) { ARG_INT16(scaleLayerIndex); BackgroundResource *bgRes = _vm->_backgroundInstances->getActiveBgResource(); - control->_actor->_flags |= Illusions::ACTOR_FLAG_4; + control->_actor->_flags |= Illusions::ACTOR_FLAG_SCALED; control->_actor->_scaleLayer = bgRes->getScaleLayer(scaleLayerIndex - 1); int scale = control->_actor->_scaleLayer->getScale(control->_actor->_position); control->setActorScale(scale); } void SequenceOpcodes::opDeactivatePathWalkRects(Control *control, OpCall &opCall) { - control->_actor->_flags &= ~Illusions::ACTOR_FLAG_10; + control->_actor->_flags &= ~Illusions::ACTOR_FLAG_HAS_WALK_RECTS; } void SequenceOpcodes::opSetPathWalkRects(Control *control, OpCall &opCall) { ARG_INT16(pathWalkRectsIndex); BackgroundResource *bgRes = _vm->_backgroundInstances->getActiveBgResource(); - control->_actor->_flags |= Illusions::ACTOR_FLAG_10; + control->_actor->_flags |= Illusions::ACTOR_FLAG_HAS_WALK_RECTS; control->_actor->_pathWalkRects = bgRes->getPathWalkRects(pathWalkRectsIndex - 1); } void SequenceOpcodes::opSetPriority(Control *control, OpCall &opCall) { ARG_INT16(priority); - control->_actor->_flags &= ~Illusions::ACTOR_FLAG_8; + control->_actor->_flags &= ~Illusions::ACTOR_FLAG_PRIORITY; control->setPriority(priority); } void SequenceOpcodes::opSetPriorityLayer(Control *control, OpCall &opCall) { ARG_INT16(priorityLayerIndex); BackgroundResource *bgRes = _vm->_backgroundInstances->getActiveBgResource(); - control->_actor->_flags |= Illusions::ACTOR_FLAG_8; + control->_actor->_flags |= Illusions::ACTOR_FLAG_PRIORITY; control->_actor->_priorityLayer = bgRes->getPriorityLayer(priorityLayerIndex - 1); int priority = control->_actor->_priorityLayer->getPriority(control->_actor->_position); control->setPriority(priority); } void SequenceOpcodes::opDisableAutoRegionLayer(Control *control, OpCall &opCall) { - control->_actor->_flags &= ~Illusions::ACTOR_FLAG_20; + control->_actor->_flags &= ~Illusions::ACTOR_FLAG_REGION; } void SequenceOpcodes::opSetRegionLayer(Control *control, OpCall &opCall) { ARG_INT16(regionLayerIndex); BackgroundResource *bgRes = _vm->_backgroundInstances->getActiveBgResource(); - control->_actor->_flags |= Illusions::ACTOR_FLAG_20; + control->_actor->_flags |= Illusions::ACTOR_FLAG_REGION; control->_actor->_regionLayer = bgRes->getRegionLayer(regionLayerIndex - 1); } |