[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.10,2.11
Pawel Kolodziejski
aquadran at users.sourceforge.net
Mon Apr 21 06:01:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv6610
Modified Files:
script_v2.cpp
Log Message:
some next changes
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- script_v2.cpp 21 Apr 2003 12:31:08 -0000 2.10
+++ script_v2.cpp 21 Apr 2003 12:59:57 -0000 2.11
@@ -467,16 +467,17 @@
if (whereIsObject(obj) != WIO_NOT_FOUND) {
ObjectData *od = &_objs[getObjectIndex(obj)];
- od->walk_y = y;
+ od->walk_y = (y << 5) | (od->walk_y & 0x1F);
}
}
void Scumm_v2::o2_getObjY() {
int obj = getVarOrDirectWord(0x80);
+ getResultPos();
if (whereIsObject(obj) != WIO_NOT_FOUND) {
ObjectData *od = &_objs[getObjectIndex(obj)];
- _vars[_resultVarNumber] = od->walk_y;
+ _vars[_resultVarNumber] = od->walk_y >> 5;
} else {
_vars[_resultVarNumber] = 0xFF;
}
@@ -564,20 +565,19 @@
int a;
getResultPosDirect();
a = getVarOrDirectWord(0x80);
- setResult(readVar(_resultVarNumber) + a);
+ _vars[_resultVarNumber] += a;
}
void Scumm_v2::o2_subDirect() {
int a;
getResultPosDirect();
a = getVarOrDirectWord(0x80);
- setResult(readVar(_resultVarNumber) - a);
+ _vars[_resultVarNumber] -= a;
}
void Scumm_v2::o2_waitForActor() {
- byte *oldaddr = _scriptPointer - 1;
- if (derefActorSafe(getVarOrDirectByte(0x80), "o5_wait")->moving) {
- _scriptPointer = oldaddr;
+ if (derefActorSafe(getVarOrDirectByte(0x80), "o2_waitForActor")->moving) {
+ _scriptPointer -= 2;
o5_breakHere();
}
}
@@ -617,11 +617,9 @@
}
void Scumm_v2::o2_waitForSentence() {
- if (_sentenceNum) {
- if (_sentence[_sentenceNum - 1].freezeCount && !isScriptInUse(_vars[VAR_SENTENCE_SCRIPT]))
+ if (_sentenceNum)
+ if (!isScriptInUse(2))
return;
- } else if (!isScriptInUse(_vars[VAR_SENTENCE_SCRIPT]))
- return;
_scriptPointer--;
o5_breakHere();
More information about the Scummvm-git-logs
mailing list