thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renamed new_1, new_2, new_3 in class Actor

Browse source 
svn-id: r6069
This commit is contained in:
Max Horn 2002-12-23 14:16:43 +00:00
parent e192142dac
commit cc5872924e
6 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scumm/actor.cpp
View file

@ -47,8 +47,8 @@ void Actor::initActor(int mode)
elevation = 0;
width = 24;
talkColor = 15;
new_2 = 0;
new_1 = -80;
talkPosX = -80;
talkPosY = 0;
scaley = scalex = 0xFF;
charset = 0;
sound[0] = 0;
@ -71,7 +71,7 @@ void Actor::initActor(int mode)
ignoreBoxes = 0;
forceClip = 0;
new_3 = 0;
ignoreTurns = false;
initFrame = 1;
walkFrame = 2;
standFrame = 3;

4
scumm/actor.h
View file

@ -92,9 +92,9 @@ public:
byte frame;
byte walkbox;
byte animProgress, animSpeed;
int16 new_1, new_2;
int16 talkPosX, talkPosY;
uint16 talk_script, walk_script;
byte new_3;
bool ignoreTurns; // TODO - we do not honor this flag at all currently!
int8 layer;
ActorWalkData walkdata;
int16 animVariable[16];

6
scumm/saveload.cpp
View file

@ -280,9 +280,9 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion)
MKLINE(Actor, needBgReset, sleByte, VER_V8),
MKLINE(Actor, costumeNeedsInit, sleByte, VER_V8),
MKLINE(Actor, new_1, sleInt16, VER_V8),
MKLINE(Actor, new_2, sleInt16, VER_V8),
MKLINE(Actor, new_3, sleByte, VER_V8),
MKLINE(Actor, talkPosX, sleInt16, VER_V8),
MKLINE(Actor, talkPosY, sleInt16, VER_V8),
MKLINE(Actor, ignoreTurns, sleByte, VER_V8),
MKLINE(Actor, layer, sleByte, VER_V8),

9
scumm/script_v6.cpp
View file

@ -1659,6 +1659,7 @@ void Scumm_v6::o6_actorSet()
a->standFrame = pop();
break;
case 82:
// FIXME: what does this opcode do ???
pop();
pop();
pop();
@ -1734,18 +1735,18 @@ void Scumm_v6::o6_actorSet()
a->shadow_mode = pop();
break;
case 99:
a->new_1 = pop();
a->new_2 = pop();
a->talkPosX = pop();
a->talkPosY = pop();
break;
case 198: /* set anim variable */
i = pop(); /* value */
a->setAnimVar(pop(), i);
break;
case 215:
a->new_3 = 1;
a->ignoreTurns = true;
break;
case 216:
a->new_3 = 0;
a->ignoreTurns = false;
break;
case 217:
a->initActor(2);

4
scumm/script_v8.cpp
View file

@ -161,8 +161,8 @@ void Scumm_v8::setupOpcodes()
OPCODE(o8_unknown),
OPCODE(o8_unknown),
/* 64 */
OPCODE(o6_jumpFalse), // Not sure about which of these two is which (false==if or true==if ?!?)...
OPCODE(o6_jumpTrue), // ... since "if" could mean 'jump "if"' or 'execute following code "if", otherwise jump'.
OPCODE(o6_jumpFalse),
OPCODE(o6_jumpTrue),
OPCODE(o6_jump),
OPCODE(o6_breakHere),
/* 68 */

8
scumm/string.cpp
View file

@ -477,16 +477,16 @@ void Scumm::CHARSET_1()
if (_string[0].xpos > _realWidth - 80)
_string[0].xpos = _realWidth - 80;
} else {
s = a->scaley * a->new_1 / 0xFF;
_string[0].ypos = ((a->new_1 - s) >> 1) + s - a->elevation + a->y;
s = a->scaley * a->talkPosX / 0xFF;
_string[0].ypos = ((a->talkPosX - s) >> 1) + s - a->elevation + a->y;
if (_string[0].ypos < 1)
_string[0].ypos = 1;
if (_string[0].ypos < camera._cur.y - (_realHeight / 2))
_string[0].ypos = camera._cur.y - (_realHeight / 2);
s = a->scalex * a->new_2 / 0xFF;
_string[0].xpos = ((a->new_2 - s) >> 1) + s + a->x - camera._cur.x + (_realWidth / 2);
s = a->scalex * a->talkPosY / 0xFF;
_string[0].xpos = ((a->talkPosY - s) >> 1) + s + a->x - camera._cur.x + (_realWidth / 2);
if (_string[0].xpos < 80)
_string[0].xpos = 80;
if (_string[0].xpos > _realWidth - 80)