[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.149.2.3,1.149.2.4 scummvm.cpp,2.577.2.27,2.577.2.28
Travis Howell
kirben at users.sourceforge.net
Tue Aug 3 03:37:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23111/scumm
Modified Files:
Tag: branch-0-6-0
script.cpp scummvm.cpp
Log Message:
Back port changes for bug #902014
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.149.2.3
retrieving revision 1.149.2.4
diff -u -d -r1.149.2.3 -r1.149.2.4
--- script.cpp 21 Jul 2004 10:58:32 -0000 1.149.2.3
+++ script.cpp 3 Aug 2004 10:36:12 -0000 1.149.2.4
@@ -211,7 +211,7 @@
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) {
if (script == ss->number && ss->status != ssDead &&
(ss->where == WIO_GLOBAL || ss->where == WIO_LOCAL)) {
- if (ss->cutsceneOverride)
+ if (ss->cutsceneOverride && _version >= 5)
error("Script %d stopped with active cutscene/override", script);
ss->number = 0;
ss->status = ssDead;
@@ -248,7 +248,7 @@
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) {
if (script == ss->number && ss->status != ssDead &&
(ss->where == WIO_ROOM || ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT)) {
- if (ss->cutsceneOverride)
+ if (ss->cutsceneOverride && _version >= 5)
error("Object %d stopped with active cutscene/override", script);
ss->number = 0;
ss->status = ssDead;
@@ -657,12 +657,14 @@
if (ss->where != WIO_GLOBAL && ss->where != WIO_LOCAL) {
if (ss->cutsceneOverride) {
- warning("Object %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
+ if (_version >= 5)
+ warning("Object %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
ss->cutsceneOverride = 0;
}
} else {
if (ss->cutsceneOverride) {
- warning("Script %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
+ if (_version >= 5)
+ warning("Script %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
ss->cutsceneOverride = 0;
}
}
@@ -819,15 +821,16 @@
ss = vm.slot;
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++) {
if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
- if (ss->cutsceneOverride != 0) {
- warning("Object %d stopped with active cutscene/override in exit", ss->number);
+ if (ss->cutsceneOverride) {
+ if (_version >= 5)
+ warning("Object %d stopped with active cutscene/override in exit", ss->number);
ss->cutsceneOverride = 0;
}
ss->status = ssDead;
} else if (ss->where == WIO_LOCAL) {
- // HACK to make Indy3 Demo work
- if (ss->cutsceneOverride != 0 && !(_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && _roomResource == 3)) {
- warning("Script %d stopped with active cutscene/override in exit", ss->number);
+ if (ss->cutsceneOverride) {
+ if (_version >= 5)
+ warning("Script %d stopped with active cutscene/override in exit", ss->number);
ss->cutsceneOverride = 0;
}
ss->status = ssDead;
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.27
retrieving revision 2.577.2.28
diff -u -d -r2.577.2.27 -r2.577.2.28
--- scummvm.cpp 29 Jul 2004 09:56:11 -0000 2.577.2.27
+++ scummvm.cpp 3 Aug 2004 10:36:13 -0000 2.577.2.28
@@ -1992,21 +1992,12 @@
if (_currentScript != 0xFF) {
if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
- if (ss->cutsceneOverride != 0)
+ if (ss->cutsceneOverride && _version >= 5)
error("Object %d stopped with active cutscene/override in exit", ss->number);
_currentScript = 0xFF;
} else if (ss->where == WIO_LOCAL) {
- if (ss->cutsceneOverride != 0) {
- if (_gameId == GID_ZAK256 && _roomResource == 15 && ss->number == 202) {
- // HACK to make Zak256 work (see bug #770093)
- warning("Script %d stopped with active cutscene/override in exit", ss->number);
- } else if (_gameId == GID_INDY3 && (_features & GF_OLD_BUNDLE) && _roomResource == 3) {
- // HACK to make Indy3 Demo work
- warning("Script %d stopped with active cutscene/override in exit", ss->number);
- } else {
- error("Script %d stopped with active cutscene/override in exit", ss->number);
- }
- }
+ if (ss->cutsceneOverride && _version >= 5)
+ error("Script %d stopped with active cutscene/override in exit", ss->number);
_currentScript = 0xFF;
}
}
More information about the Scummvm-git-logs
mailing list