diff options
| author | Max Horn | 2006-11-13 20:20:01 +0000 |
|---|---|---|
| committer | Max Horn | 2006-11-13 20:20:01 +0000 |
| commit | df2ccb78c2bb48c2b12027063770f3e0dce8eb6d (patch) | |
| tree | a12af8d871048aec8494c8287bcc8042d2e9adce /engines | |
| parent | 12fb12caf5d25725a706b7c3900a48d4eea2c103 (diff) | |
| download | scummvm-rg350-df2ccb78c2bb48c2b12027063770f3e0dce8eb6d.tar.gz scummvm-rg350-df2ccb78c2bb48c2b12027063770f3e0dce8eb6d.tar.bz2 scummvm-rg350-df2ccb78c2bb48c2b12027063770f3e0dce8eb6d.zip | |
cleanup
svn-id: r24711
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/script_v6.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index 4b5064b042..070a675862 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -2524,16 +2524,17 @@ void ScummEngine_v7::o6_kernelSetFunctions() { // SMUSH movie playback if (args[1] == 0) { - assert(getStringAddressVar(VAR_VIDEONAME)); - if (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "sq3.san") == 0) + const char *videoname = (const char *)getStringAddressVar(VAR_VIDEONAME); + assert(videoname); + if (strcmp(videoname, "sq3.san") == 0) _smushFrameRate = 14; // Correct incorrect smush filename in Macintosh FT demo if ((_game.id == GID_FT) && (_game.features & GF_DEMO) && (_game.platform == Common::kPlatformMacintosh) && - (strcmp((char *)getStringAddressVar(VAR_VIDEONAME), "jumpgorge.san") == 0)) + (strcmp(videoname, "jumpgorge.san") == 0)) _splayer->play("jumpgorg.san", _smushFrameRate); else - _splayer->play((char *)getStringAddressVar(VAR_VIDEONAME), _smushFrameRate); + _splayer->play(videoname, _smushFrameRate); if (_game.id == GID_DIG) { _disableFadeInEffect = true; |