libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-05 17:20:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASYLUM: Fixed a bug from the original game that caused the application to be locked (and occasionally crash) due to the fact that the application was locked in a while loop during the playing of the first sfx item after the intro video.

Browse Source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@298 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Alex Bevilacqua 2009-08-09 22:56:13 +00:00 committed by Eugene Sandulenko
parent bffebfd830
commit f48ab391ac
No known key found for this signature in database
GPG Key ID: 014D387312D34F08
2 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
engines/asylum/asylum.cpp
View File

@ -89,6 +89,8 @@ Common::Error AsylumEngine::init() {
Shared.setSound(_sound);
Shared.setVideo(_video);
_introPlaying = false;
return Common::kNoError;
}
@ -123,10 +125,10 @@ Common::Error AsylumEngine::go() {
// Also, this routine is used to set game flags 4 and 12, so if we're
// skipping the intro, but not loading a save file, those flags
// need to be set somewhere else.
//playIntro();
playIntro();
// Enter first scene
_scene->enterScene();
//_scene->enterScene();
while (!shouldQuit()) {
checkForEvent(true);
@ -162,27 +164,40 @@ void AsylumEngine::playIntro() {
_sound->playSfx(introRes, 7);
if (_sound->isSfxActive()) {
while (_sound->isSfxActive()) {
;
}
}
_introPlaying = true;
delete introRes;
// TODO Since we've currently only got one sfx handle to play with in
// the sound class, entering the scene overwrites the "alarm" loop.
// This sound is technically supposed to play until the actor disables
// the alarm by flipping the switch. The sound class needs to be extended
// to be able to handle multiple handles.
// The currently active sound resources can probably also be buffered into
// the scene's soundResId[] array (seems that's the way the original worked,
// especially when you examine isSoundinList() or isSoundPlaying())
_scene->enterScene();
}
void AsylumEngine::checkForEvent(bool doUpdate) {
// NOTE
// In the original version of Sanitarium, the control loop for the sound
// effect that played after the intro video involved a while loop that
// executed until the sound handle was released.
// This caused the application to be locked until the while loop's execution
// completed successfully. Our implementation circumvents this issue
// by moving the logic to the event loop and checking whether a flag is
// set to determine if control should be returned to the engine.
if (_introPlaying) {
if (!_sound->isSfxActive()) {
_introPlaying = false;
// TODO Since we've currently only got one sfx handle to play with in
// the sound class, entering the scene overwrites the "alarm" loop.
// This sound is technically supposed to play until the actor disables
// the alarm by flipping the switch. The sound class needs to be extended
// to be able to handle multiple handles.
// The currently active sound resources can probably also be buffered into
// the scene's soundResId[] array (seems that's the way the original worked,
// especially when you examine isSoundinList() or isSoundPlaying())
_scene->enterScene();
} else {
return;
}
}
Common::Event ev;
if (_system->getEventManager()->pollEvent(ev)) {
@ -234,6 +249,10 @@ void AsylumEngine::checkForEvent(bool doUpdate) {
else if (_scene->getBlowUpPuzzle()->isActive())
// Pass events to BlowUp Puzzles
_scene->getBlowUpPuzzle()->handleEvent(&ev, doUpdate);
if (_introPlaying) {
}
}
void AsylumEngine::processDelayedEvents() {

2
engines/asylum/asylum.h
View File

@ -82,6 +82,8 @@ private:
Common::Language _language;
Common::RandomSource _rnd;
bool _introPlaying;
Console *_console;
Scene *_scene;
MainMenu *_mainMenu;