diff options
| author | Gregory Montoir | 2004-01-14 14:34:05 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-01-14 14:34:05 +0000 |
| commit | 6c78f2a6b801ae8a8efb7f9db9bf0213ce3eb759 (patch) | |
| tree | aaf89d79270a296bb9beab7d563639f20acbf260 /queen/cutaway.cpp | |
| parent | 9f8caa6889c5504edb279cacc524c142eb5829d1 (diff) | |
| download | scummvm-rg350-6c78f2a6b801ae8a8efb7f9db9bf0213ce3eb759.tar.gz scummvm-rg350-6c78f2a6b801ae8a8efb7f9db9bf0213ce3eb759.tar.bz2 scummvm-rg350-6c78f2a6b801ae8a8efb7f9db9bf0213ce3eb759.zip | |
- tweaked a bit walking functions to make persons stop walking when a cutaway is canceled
- removed unpack to bob frame 2 (as it is never used)
- changed some error() calls to assert()
- minor cleanups
svn-id: r12385
Diffstat (limited to 'queen/cutaway.cpp')
| -rw-r--r-- | queen/cutaway.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 78d301d5ef..a1fb7ef3d3 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -77,9 +77,6 @@ void Cutaway::load(const char *filename) { debug(6, "----- Cutaway::load(\"%s\") -----", filename); ptr = _fileData = _vm->resource()->loadFile(filename, 20); - if (!_fileData) { - error("Failed to load resource data file '%s'", filename); - } if (0 == scumm_stricmp(filename, "comic.cut")) /* XXX _songBeforeComic = CURRSONG */; @@ -956,7 +953,7 @@ void Cutaway::run(char *nextFilename) { if (_roomFade) { _vm->update(); int end = 223; - if (_vm->logic()->isIntroRoom(_vm->logic()->currentRoom())) { + if (Logic::isIntroRoom(_vm->logic()->currentRoom())) { end = 255; } BobSlot *j = _vm->graphics()->bob(0); |