diff options
| -rw-r--r-- | scumm/actor.cpp | 4 | ||||
| -rw-r--r-- | scumm/actor.h | 2 | ||||
| -rw-r--r-- | scumm/base-costume.cpp | 2 | ||||
| -rw-r--r-- | scumm/base-costume.h | 4 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v6he.cpp | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 7b0fac37eb..e465ecc173 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -57,7 +57,7 @@ Actor::Actor() { walkbox = 0; animProgress = 0; skipLimb = false; - actor_draw_to_bg = false; + actorDrawVirScr = false; memset(animVariable, 0, sizeof(animVariable)); memset(palette, 0, sizeof(palette)); memset(sound, 0, sizeof(sound)); @@ -1018,7 +1018,7 @@ void Actor::drawActorCostume() { bcr->_draw_bottom = bottom = 0; bcr->_skipLimb = (skipLimb != 0); - bcr->_actor_draw_to_bg = (actor_draw_to_bg != 0); + bcr->_actorDrawVirScr = (actorDrawVirScr != 0); // If the actor is partially hidden, redraw it next frame. // Only done for pre-AKOS, though. diff --git a/scumm/actor.h b/scumm/actor.h index 769ed1f1b2..ba766f8263 100644 --- a/scumm/actor.h +++ b/scumm/actor.h @@ -108,7 +108,7 @@ public: uint16 talkScript, walkScript; bool ignoreTurns; bool skipLimb; - bool actor_draw_to_bg; + bool actorDrawVirScr; int8 layer; uint16 sound[8]; CostumeData cost; diff --git a/scumm/base-costume.cpp b/scumm/base-costume.cpp index 68275c3956..0a4de63d43 100644 --- a/scumm/base-costume.cpp +++ b/scumm/base-costume.cpp @@ -29,7 +29,7 @@ byte BaseCostumeRenderer::drawCostume(const VirtScreen &vs, const CostumeData &c int i; byte result = 0; - if (_actor_draw_to_bg) + if (_actorDrawVirScr) _outptr = _vm->getResourceAddress(rtBuffer, 5) + vs.xstart; else _outptr = vs.screenPtr + vs.xstart; diff --git a/scumm/base-costume.h b/scumm/base-costume.h index a8dc0a2712..533e77523a 100644 --- a/scumm/base-costume.h +++ b/scumm/base-costume.h @@ -62,7 +62,7 @@ public: int _draw_top, _draw_bottom; bool _skipLimb; - bool _actor_draw_to_bg; + bool _actorDrawVirScr; protected: @@ -117,7 +117,7 @@ public: _mirror = false; _width = _height = 0; _skipLimb = 0; - _actor_draw_to_bg = 0; + _actorDrawVirScr = 0; _outptr = 0; diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 962568665c..ee924eed2d 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2921,9 +2921,9 @@ void ScummEngine_v6::o6_stampObject() { a->scalex = state; a->scaley = state; a->putActor(x, y, _currentRoom); - a->actor_draw_to_bg = true; + a->actorDrawVirScr = true; a->drawActorCostume(); - a->actor_draw_to_bg = false; + a->actorDrawVirScr = false; a->drawActorCostume(); return; } diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index e4135997b0..3200f55a13 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -677,10 +677,10 @@ void ScummEngine_v6he::o6_actorOps() { { int top_actor = a->top; int bottom_actor = a->bottom; - a->actor_draw_to_bg = true; + a->actorDrawVirScr = true; a->needRedraw = true; a->drawActorCostume(); - a->actor_draw_to_bg = false; + a->actorDrawVirScr = false; a->needRedraw = true; a->drawActorCostume(); a->needRedraw = false; @@ -693,7 +693,7 @@ void ScummEngine_v6he::o6_actorOps() { } break; case 219: - a->actor_draw_to_bg = false; + a->actorDrawVirScr = false; a->needRedraw = true; a->needBgReset = true; break; |