diff options
| author | Paweł Kołodziejski | 2003-03-17 12:32:46 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-03-17 12:32:46 +0000 |
| commit | d434b86ddb0e8a72489366a513b669179b61d316 (patch) | |
| tree | a46a04ae67a4cccc0048f63fb71c3208f4a9b8be /scumm/script_v6.cpp | |
| parent | 06ef80fa6170bec33f9ac117400fa86f965c4aa7 (diff) | |
| download | scummvm-rg350-d434b86ddb0e8a72489366a513b669179b61d316.tar.gz scummvm-rg350-d434b86ddb0e8a72489366a513b669179b61d316.tar.bz2 scummvm-rg350-d434b86ddb0e8a72489366a513b669179b61d316.zip | |
split waitForTimer func, update for smush,
btw, switching scalers while playing smush movies doesn't work or at least SDL backend,
it hang on SDL_SetVideo func
svn-id: r6818
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 9fcb93c3ab..5d9d5524b2 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -30,8 +30,7 @@ #include "sound.h" #include "verbs.h" #include <time.h> -#include "smush/player.h" -#include "smush/scumm_renderer.h" +#include "smush/smush_player.h" #include "sound/mididrv.h" @@ -2337,11 +2336,8 @@ void Scumm_v6::o6_kernelSetFunctions() { debug(1, "INSANE Arg: %d", args[1]); - ScummRenderer *sr = new ScummRenderer(this, speed); - SmushPlayer *sp = new SmushPlayer(sr); - - if (_noSubtitles) - sp->hide("subtitles"); + SmushPlayer *sp = new SmushPlayer(this, speed, !_noSubtitles); + // INSANE mode 0: SMUSH movie playback if (args[1] == 0) { sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath()); @@ -2378,7 +2374,7 @@ void Scumm_v6::o6_kernelSetFunctions() { putState(235, 1); // Cheat and activate Ramp writeVar(142 | 0x8000, 1); // Cheat and activate auto-booster (fan) } -// sp->play("minefite.san", getGameDataPath()); +// smush->play("minefite.san", getGameDataPath()); break; } case 4: @@ -2403,7 +2399,6 @@ void Scumm_v6::o6_kernelSetFunctions() { sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath()); } delete sp; - delete sr; } break; case 7: |