[Scummvm-cvs-logs] CVS: scummvm saveload.cpp,1.60,1.61 script.cpp,1.68,1.69 script_v2.cpp,1.86,1.87 scumm.h,1.209,1.210
Ralph Brorsen
painelf at users.sourceforge.net
Fri Aug 23 15:08:02 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.43,1.44 mixer.cpp,1.51,1.52
- Next message: [Scummvm-cvs-logs] CVS: scummvm saveload.cpp,1.60,1.61 script.cpp,1.68,1.69 script_v2.cpp,1.86,1.87 scumm.h,1.209,1.210
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv30996/scummvm
Modified Files:
saveload.cpp script.cpp script_v2.cpp scumm.h
Log Message:
Fix for #556564 (see bug for details); Rename of ScriptSlot::newfield and Scumm::o6_breakMaybe()
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- saveload.cpp 18 Aug 2002 22:47:10 -0000 1.60
+++ saveload.cpp 23 Aug 2002 22:07:39 -0000 1.61
@@ -535,7 +535,7 @@
MKLINE(ScriptSlot, offs, sleUint32),
MKLINE(ScriptSlot, delay, sleInt32),
MKLINE(ScriptSlot, number, sleUint16),
- MKLINE(ScriptSlot, newfield, sleUint16),
+ MKLINE(ScriptSlot, frameDelayCount, sleUint16),
MKLINE(ScriptSlot, status, sleByte),
MKLINE(ScriptSlot, where, sleByte),
MKLINE(ScriptSlot, unk1, sleByte),
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- script.cpp 4 Aug 2002 02:53:50 -0000 1.68
+++ script.cpp 23 Aug 2002 22:07:39 -0000 1.69
@@ -69,7 +69,8 @@
s->where = scriptType;
s->unk1 = a;
s->unk2 = b;
- s->freezeCount = 0;
+ s->freezeCount = 0;
+ s->frameDelayCount = 0;
initializeLocals(slot, lvarptr);
@@ -770,7 +771,7 @@
vm.slot[slot].unk1 = a;
vm.slot[slot].unk2 = b;
vm.slot[slot].freezeCount = 0;
- vm.slot[slot].newfield = 0;
+ vm.slot[slot].frameDelayCount = 0;
initializeLocals(slot, vars);
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- script_v2.cpp 19 Aug 2002 17:20:54 -0000 1.86
+++ script_v2.cpp 23 Aug 2002 22:07:39 -0000 1.87
@@ -285,7 +285,7 @@
/* C8 */
&Scumm::o6_kernelFunction,
&Scumm::o6_miscOps,
- &Scumm::o6_breakMaybe,
+ &Scumm::o6_delayFrames,
&Scumm::o6_pickOneOf,
/* CC */
&Scumm::o6_pickOneOfDefault,
@@ -608,7 +608,7 @@
/* C8 */
"o6_kernelFunction",
"o6_miscOps",
- "o6_breakMaybe",
+ "o6_delayFrames",
"o6_pickOneOf",
/* CC */
"o6_pickOneOfDefault",
@@ -2980,15 +2980,15 @@
}
}
-void Scumm::o6_breakMaybe()
+void Scumm::o6_delayFrames()
{
ScriptSlot *ss = &vm.slot[_currentScript];
- if (ss->newfield == 0) {
- ss->newfield = pop();
+ if (ss->frameDelayCount == 0) {
+ ss->frameDelayCount = pop();
} else {
- ss->newfield--;
+ ss->frameDelayCount--;
}
- if (ss->newfield) {
+ if (ss->frameDelayCount) {
_scriptPointer--;
o6_breakHere();
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- scumm.h 20 Aug 2002 02:20:40 -0000 1.209
+++ scumm.h 23 Aug 2002 22:07:39 -0000 1.210
@@ -108,7 +108,7 @@
uint32 offs;
int32 delay;
uint16 number;
- uint16 newfield;
+ uint16 frameDelayCount;
byte status;
byte where;
byte unk1, unk2, freezeCount, didexec;
@@ -1212,7 +1212,7 @@
void o6_distPtPt();
void o6_dummy_stacklist();
void o6_miscOps();
- void o6_breakMaybe();
+ void o6_delayFrames();
void o6_pickOneOf();
void o6_pickOneOfDefault();
void o6_jumpToScript();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.43,1.44 mixer.cpp,1.51,1.52
- Next message: [Scummvm-cvs-logs] CVS: scummvm saveload.cpp,1.60,1.61 script.cpp,1.68,1.69 script_v2.cpp,1.86,1.87 scumm.h,1.209,1.210
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list