libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 13:13:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

changed check to _insaneRunning

Browse Source 
svn-id: r13986
This commit is contained in:
Paweł Kołodziejski 2004-06-20 21:01:32 +00:00
parent 80216dc6d6
commit 8b789937c6
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scumm/imuse_digi/dimuse_script.cpp
View File

@ -163,8 +163,7 @@ void IMuseDigital::flushTracks() {
debug(5, "flushTracks()");
for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) {
Track *track = _track[l];
if (track->used &&
(track->readyToRemove || (!_vm->_videoFinished && track->toBeRemoved))) {
if (track->used && (track->readyToRemove || (_vm->_insaneRunning && track->toBeRemoved))) {
if ((track->stream) && (!track->stream->endOfStream())) {
track->stream->finish();
} else if ((track->stream) && (track->stream->endOfStream())) {
@ -375,6 +374,7 @@ void IMuseDigital::stopAllSounds() {
if (!foundNotRemoved)
break;
flushTracks();
_vm->_system->delay_msecs(50);
}
}

1
scumm/imuse_digi/dimuse_track.cpp
View File

@ -179,6 +179,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
track->used = true;
return;
}
_vm->_system->delay_msecs(50);
}
}

4
scumm/script_v6.cpp
View File

@ -2499,8 +2499,10 @@ void ScummEngine_v6::o6_kernelSetFunctions() {
const int insaneVarNum = ((_features & GF_DEMO) && (_features & GF_PC))
? 232 : 233;
_insane->setSmushParams(speed);
_insaneRunning = true;
_insane->setSmushParams(speed);
_insane->runScene(insaneVarNum);
_insaneRunning = false;
}
}
break;

1
scumm/scumm.cpp
View File

@ -352,6 +352,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_smushFrameRate = 0;
_videoFinished = false;
_smushPaused = false;
_insaneRunning = false;
_quit = false;
_pauseDialog = NULL;
_optionsDialog = NULL;

3
scumm/scumm.h
View File

@ -394,7 +394,8 @@ public:
int _smushFrameRate;
bool _videoFinished;
bool _smushPaused;
bool _insaneRunning;
void pauseGame();
void restart();
void shutDown();