diff options
| author | Torbjörn Andersson | 2004-03-02 07:02:31 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-03-02 07:02:31 +0000 |
| commit | 1bdcc3e5efb20c69691275897536018a302c1745 (patch) | |
| tree | b22c4774edf351d5c0fe3edaa68a46682f8341bb /sword2 | |
| parent | ca85e8d51d5a8b2d0489dbfb3d33a15480b1a90e (diff) | |
| download | scummvm-rg350-1bdcc3e5efb20c69691275897536018a302c1745.tar.gz scummvm-rg350-1bdcc3e5efb20c69691275897536018a302c1745.tar.bz2 scummvm-rg350-1bdcc3e5efb20c69691275897536018a302c1745.zip | |
Removed the test for non-existing demo cutscenes: param[0] is an offset
into the chunk of memory handled by the memory manager, not a well-defined
value. Also, it introduced a theoretical memory leak as fnPlaySequence()
wouldn't get to clean up after itself.
The correct place for this check is probably in MoviePlayer::play(), where
you can test the name of the cutscene. On the other hand, the original demo
will gladly play eye.smk if there is one, so why shouldn't we?
svn-id: r13139
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/anims.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sword2/anims.cpp b/sword2/anims.cpp index 002b739a6d..6614ce6e82 100644 --- a/sword2/anims.cpp +++ b/sword2/anims.cpp @@ -621,10 +621,6 @@ int32 Logic::fnPlaySequence(int32 *params) { // params: 0 pointer to null-terminated ascii filename // 1 number of frames in the sequence, used for PSX. - // Only two sequences exist in demo - if ((_vm->_features & GF_DEMO) && params[0] != 3626 && params[0] != 3879846) - return IR_CONT; - char filename[30]; uint32 rv; MovieTextObject *sequenceSpeechArray[MAX_SEQUENCE_TEXT_LINES + 1]; |