[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.172,1.173 script_v2.cpp,2.248,2.249 script_v6.cpp,1.376,1.377
Max Horn
fingolfin at users.sourceforge.net
Sat Aug 14 00:05:05 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29580
Modified Files:
script.cpp script_v2.cpp script_v6.cpp
Log Message:
whitespace
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- script.cpp 5 Aug 2004 21:25:58 -0000 1.172
+++ script.cpp 14 Aug 2004 07:04:31 -0000 1.173
@@ -855,7 +855,7 @@
ss->status = ssDead;
} else if (ss->where == WIO_LOCAL) {
if (ss->cutsceneOverride) {
- if ( _version >= 5)
+ if (_version >= 5)
warning("Script %d stopped with active cutscene/override in exit", ss->number);
ss->cutsceneOverride = 0;
}
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.248
retrieving revision 2.249
diff -u -d -r2.248 -r2.249
--- script_v2.cpp 26 Jul 2004 15:14:10 -0000 2.248
+++ script_v2.cpp 14 Aug 2004 07:04:31 -0000 2.249
@@ -448,7 +448,6 @@
// script 89, script 164 isn't reran to redraw it. Why? Dunno. Hack? Yes.
if ((var == 175) && (_gameId == GID_MANIAC) && (vm.slot[_currentScript].number == 89))
runScript(164, 0, 0, 0);
-
}
void ScummEngine_v2::getResultPosIndirect() {
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -d -r1.376 -r1.377
--- script_v6.cpp 8 Aug 2004 11:43:54 -0000 1.376
+++ script_v6.cpp 14 Aug 2004 07:04:31 -0000 1.377
@@ -394,7 +394,6 @@
obj = pop();
}
-
return obj;
}
More information about the Scummvm-git-logs
mailing list