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

this should fix one of those nasty deadlocks, I hope

Browse Source 
svn-id: r6876
This commit is contained in:
Max Horn 2003-03-28 22:42:48 +00:00
parent fe58fd4d1e
commit e0a880addb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scumm/smush/smush_player.cpp
View File

@ -189,6 +189,10 @@ static StringResource *getStrings(const char *file, const char *directory, bool
SmushPlayer *player;
void smush_callback(void *ptr) {
Scumm *scumm = (Scumm *)ptr;
if (scumm->_smushPlay == false)
return;
player->_smushProcessFrame = true;
player->parseNextFrame();
player->_smushProcessFrame = false;
@ -252,8 +256,8 @@ void SmushPlayer::init() {
void SmushPlayer::deinit() {
_scumm->_smushPlay = false;
_scumm->_timer->releaseProcedure(&smush_callback);
while (_smushProcessFrame) {}
_scumm->_timer->releaseProcedure(&smush_callback);
for(int i = 0; i < 5; i++) {
if (_sf[i]) {
@ -824,9 +828,6 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) {
}
void SmushPlayer::parseNextFrame() {
if (_scumm->_smushPlay == false)
return;
Chunk *sub = _base->subBlock();
if (_base->eof()) {
_scumm->_videoFinished = true;