diff options
| author | Eugene Sandulenko | 2004-02-06 21:05:58 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-02-06 21:05:58 +0000 |
| commit | 8411a8ade175a9d35af22d108a67ff542d4441ad (patch) | |
| tree | f55184f40c0fa1130a190a4e06fa273d46d3493a /scumm/script_v6.cpp | |
| parent | 7b26a609f7c9e410c7a5930fa333901a09055bde (diff) | |
| download | scummvm-rg350-8411a8ade175a9d35af22d108a67ff542d4441ad.tar.gz scummvm-rg350-8411a8ade175a9d35af22d108a67ff542d4441ad.tar.bz2 scummvm-rg350-8411a8ade175a9d35af22d108a67ff542d4441ad.zip | |
o Now Long TRS messages get wrapped
o Approaching enemy animation fixed
o Renames some vars and struct members
o Fixed dosdemo. It didn't run
o Correct Mac demo INSANE skipping behaviour
svn-id: r12751
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 6a7011b3b9..60f15a321b 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2557,21 +2557,19 @@ void ScummEngine_v6::o6_kernelSetFunctions() { debug(1, "INSANE Arg: %d %d", args[1], args[2]); - SmushPlayer *sp = new SmushPlayer(this, speed); - // INSANE mode 0: SMUSH movie playback if (args[1] == 0) { + SmushPlayer *sp = new SmushPlayer(this, speed); + sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath()); + delete sp; } else if (_gameId == GID_FT) { - const int insaneVarNum = (_features & GF_DEMO) ? 232 : 233; + const int insaneVarNum = ((_features & GF_DEMO) && (_features & GF_PC)) + ? 232 : 233; - // PC demo uses different INSANE - if (!(_features & GF_DEMO)) { - _insane->setSmushParams(speed); - _insane->runScene(insaneVarNum); - } + _insane->setSmushParams(speed); + _insane->runScene(insaneVarNum); } - delete sp; } break; case 12: |