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

Final loom fixes. LoomCD is now completable, apart from sound glitches and lack of masking.

Browse Source 
svn-id: r3880
This commit is contained in:
James Brown
2002-04-06 03:43:54 +00:00
parent fb0cb66588
commit 141bac6fcb
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script.cpp
+9 -4
View File
@@ -408,6 +408,7 @@ void Scumm::drawBox(int x, int y, int x2, int y2, int color) {
if (x>319) return;
if (x<0) x=0;
if (y<0) y=0;
if (x2<0) return;
if (x2>320) x2=320;
if (y2 > bottom) y2=bottom;
@@ -442,11 +443,15 @@ void Scumm::stopObjectCode() {
}
if (ss->where!=WIO_GLOBAL && ss->where!=WIO_LOCAL) {
if (ss->cutsceneOverride)
error("Object %d ending with active cutscene/override", ss->number);
if (ss->cutsceneOverride) {
warning("Object %d ending with active cutscene/override", ss->number);
ss->cutsceneOverride = 0;
}
} else {
if (ss->cutsceneOverride)
error("Script %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
if (ss->cutsceneOverride) {
warning("Script %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
ss->cutsceneOverride = 0;
}
}
ss->number = 0;
ss->status = 0;