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

moved Actor SaveLoadEntry definition to actor.cpp; made findPathTowards/findPathTowardsOld members of Actor; cleanup

Browse source 
svn-id: r7988
This commit is contained in:
Max Horn 2003-05-26 02:26:13 +00:00
parent c2d065d896
commit 2f9ff35bad
5 changed files with 130 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

78
scumm/saveload.cpp
View file

@ -272,83 +272,7 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion) {
MKEND()
};
const SaveLoadEntry actorEntries[] = {
MKLINE(Actor, x, sleInt16, VER_V8),
MKLINE(Actor, y, sleInt16, VER_V8),
MKLINE(Actor, top, sleInt16, VER_V8),
MKLINE(Actor, bottom, sleInt16, VER_V8),
MKLINE(Actor, elevation, sleInt16, VER_V8),
MKLINE(Actor, width, sleUint16, VER_V8),
MKLINE(Actor, facing, sleUint16, VER_V8),
MKLINE(Actor, costume, sleUint16, VER_V8),
MKLINE(Actor, room, sleByte, VER_V8),
MKLINE(Actor, talkColor, sleByte, VER_V8),
MKLINE(Actor, talkFrequency, sleInt16, VER_V16),
MKLINE(Actor, scalex, sleByte, VER_V8),
MKLINE(Actor, scaley, sleByte, VER_V8),
MKLINE(Actor, charset, sleByte, VER_V8),
MKARRAY(Actor, sound[0], sleByte, 8, VER_V8),
MKARRAY(Actor, animVariable[0], sleUint16, 8, VER_V8),
MKLINE(Actor, newDirection, sleUint16, VER_V8),
MKLINE(Actor, moving, sleByte, VER_V8),
MKLINE(Actor, ignoreBoxes, sleByte, VER_V8),
MKLINE(Actor, forceClip, sleByte, VER_V8),
MKLINE(Actor, initFrame, sleByte, VER_V8),
MKLINE(Actor, walkFrame, sleByte, VER_V8),
MKLINE(Actor, standFrame, sleByte, VER_V8),
MKLINE(Actor, talkStartFrame, sleByte, VER_V8),
MKLINE(Actor, talkStopFrame, sleByte, VER_V8),
MKLINE(Actor, speedx, sleUint16, VER_V8),
MKLINE(Actor, speedy, sleUint16, VER_V8),
MKLINE(Actor, cost.animCounter1, sleUint16, VER_V8),
MKLINE(Actor, cost.animCounter2, sleByte, VER_V8),
// Actor palette grew from 64 to 256 bytes
MKARRAY_OLD(Actor, palette[0], sleByte, 64, VER_V8, VER_V9),
MKARRAY(Actor, palette[0], sleByte, 256, VER_V10),
MK_OBSOLETE(Actor, mask, sleByte, VER_V8, VER_V9),
MKLINE(Actor, shadow_mode, sleByte, VER_V8),
MKLINE(Actor, visible, sleByte, VER_V8),
MKLINE(Actor, frame, sleByte, VER_V8),
MKLINE(Actor, animSpeed, sleByte, VER_V8),
MKLINE(Actor, animProgress, sleByte, VER_V8),
MKLINE(Actor, walkbox, sleByte, VER_V8),
MKLINE(Actor, needRedraw, sleByte, VER_V8),
MKLINE(Actor, needBgReset, sleByte, VER_V8),
MKLINE(Actor, costumeNeedsInit, sleByte, VER_V8),
MKLINE(Actor, talkPosY, sleInt16, VER_V8),
MKLINE(Actor, talkPosX, sleInt16, VER_V8),
MKLINE(Actor, ignoreTurns, sleByte, VER_V8),
MKLINE(Actor, layer, sleByte, VER_V8),
MKLINE(Actor, talk_script, sleUint16, VER_V8),
MKLINE(Actor, walk_script, sleUint16, VER_V8),
MKLINE(Actor, walkdata.destx, sleInt16, VER_V8),
MKLINE(Actor, walkdata.desty, sleInt16, VER_V8),
MKLINE(Actor, walkdata.destbox, sleByte, VER_V8),
MKLINE(Actor, walkdata.destdir, sleUint16, VER_V8),
MKLINE(Actor, walkdata.curbox, sleByte, VER_V8),
MKLINE(Actor, walkdata.x, sleInt16, VER_V8),
MKLINE(Actor, walkdata.y, sleInt16, VER_V8),
MKLINE(Actor, walkdata.newx, sleInt16, VER_V8),
MKLINE(Actor, walkdata.newy, sleInt16, VER_V8),
MKLINE(Actor, walkdata.deltaXFactor, sleInt32, VER_V8),
MKLINE(Actor, walkdata.deltaYFactor, sleInt32, VER_V8),
MKLINE(Actor, walkdata.xfrac, sleUint16, VER_V8),
MKLINE(Actor, walkdata.yfrac, sleUint16, VER_V8),
MKARRAY(Actor, cost.active[0], sleByte, 16, VER_V8),
MKLINE(Actor, cost.stopped, sleUint16, VER_V8),
MKARRAY(Actor, cost.curpos[0], sleUint16, 16, VER_V8),
MKARRAY(Actor, cost.start[0], sleUint16, 16, VER_V8),
MKARRAY(Actor, cost.end[0], sleUint16, 16, VER_V8),
MKARRAY(Actor, cost.frame[0], sleUint16, 16, VER_V8),
MKEND()
};
const SaveLoadEntry *actorEntries = Actor::getSaveLoadEntries();
const SaveLoadEntry verbEntries[] = {
MKLINE(VerbSlot, x, sleInt16, VER_V8),