diff options
| author | James Brown | 2002-04-06 03:43:54 +0000 |
|---|---|---|
| committer | James Brown | 2002-04-06 03:43:54 +0000 |
| commit | 141bac6fcbd19ef08fcd5675545517fe43b7fcd1 (patch) | |
| tree | ab66b4b7e838c97acf4a97a667158a68b6acacad /script.cpp | |
| parent | fb0cb665888c4d59ff9f973def998ebe532c4b76 (diff) | |
| download | scummvm-rg350-141bac6fcbd19ef08fcd5675545517fe43b7fcd1.tar.gz scummvm-rg350-141bac6fcbd19ef08fcd5675545517fe43b7fcd1.tar.bz2 scummvm-rg350-141bac6fcbd19ef08fcd5675545517fe43b7fcd1.zip | |
Final loom fixes. LoomCD is now completable, apart from sound glitches and lack of masking.
svn-id: r3880
Diffstat (limited to 'script.cpp')
| -rw-r--r-- | script.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/script.cpp b/script.cpp index 342c1ffff8..e8d03903cb 100644 --- a/script.cpp +++ b/script.cpp @@ -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; |