ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup - we now know that the frame field in Actor is needed, we just have to figure out how to set it correctly

Browse Source 
svn-id: r5978
This commit is contained in:
Max Horn
2002-12-15 17:28:46 +00:00
parent 9648ea6f44
commit f4dfa923f7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/saveload.cpp
-1
View File
@@ -263,7 +263,6 @@ void Scumm::saveOrLoad(Serializer *s, uint32 savegameVersion)
MK_OBSOLETE(Actor, mask, sleByte, VER_V8, VER_V9),
MKLINE(Actor, shadow_mode, sleByte, VER_V8),
MKLINE(Actor, visible, sleByte, VER_V8),
// FIXME - frame is never set and thus always 0! See actor.h comment
MKLINE(Actor, frame, sleByte, VER_V8),
MKLINE(Actor, animSpeed, sleByte, VER_V8),
MKLINE(Actor, animProgress, sleByte, VER_V8),
scumm/script_v6.cpp
+7 -6
View File
@@ -1737,9 +1737,6 @@ void Scumm::o6_actorSet()
case 228: /* walk script */
a->walk_script = pop();
break;
case 235: /* talk_script */
a->talk_script = pop();
break;
case 229: /* stand */
a->stopActorMoving();
a->startAnimActor(a->standFrame);
@@ -1757,6 +1754,9 @@ void Scumm::o6_actorSet()
case 234: /* unfreeze actor */
a->moving &= ~0x7f;
break;
case 235: /* talk_script */
a->talk_script = pop();
break;
default:
error("o6_actorset: default case %d", b);
}
@@ -2080,7 +2080,6 @@ void Scumm::o6_wait()
int actnum = pop();
Actor *a = derefActorSafe(actnum, "o6_wait:226");
int offs = (int16)fetchScriptWord();
if (a && a->isInCurrentRoom() && a->needRedraw) {
_scriptPointer += offs;
o6_breakHere();
@@ -2088,7 +2087,9 @@ void Scumm::o6_wait()
return;
}
case 232:{ /* wait until actor stops turning */
Actor *a = derefActorSafe(pop(), "o6_wait:226");
int actnum = pop();
Actor *a = derefActorSafe(actnum, "o6_wait:232");
printf("
int offs = (int16)fetchScriptWord();
if (a && a->isInCurrentRoom() && a->moving & MF_TURN) {
_scriptPointer += offs;
@@ -2788,7 +2789,7 @@ void Scumm::o6_kernelFunction()
break;
case 212:
a = derefActorSafe(args[1], "o6_kernelFunction:212");
// FIXME - frame is never set and thus always 0! See actor.h comment
// This is used by walk scripts
push(a->frame);
break;
case 215: