libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename var

Browse Source 
svn-id: r14121
This commit is contained in:
Travis Howell 2004-06-29 11:02:15 +00:00
parent bebf55492a
commit 26e38321df
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scumm/actor.cpp
View File

@ -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.

2
scumm/actor.h
View File

@ -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;

2
scumm/base-costume.cpp
View File

@ -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;

4
scumm/base-costume.h
View File

@ -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;

4
scumm/script_v6.cpp
View File

@ -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;
}

6
scumm/script_v6he.cpp
View File

@ -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;