thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refreshScript was wrong used

Browse source 
svn-id: r13512
This commit is contained in:
Paweł Kołodziejski 2004-04-09 04:56:18 +00:00
parent 5f89f5b2b7
commit d368d2e7fa
4 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scumm/imuse_digi/dimuse.h
View file

@ -146,7 +146,6 @@ public:
void stopAllSounds(bool waitForStop); void stopAllSounds(bool waitForStop);
void pause(bool pause); void pause(bool pause);
void parseScriptCmds(int a, int b, int c, int d, int e, int f, int g, int h); void parseScriptCmds(int a, int b, int c, int d, int e, int f, int g, int h);
void refreshScripts();
int getSoundStatus(int sound) const; int getSoundStatus(int sound) const;
int32 getCurMusicPosInMs(); int32 getCurMusicPosInMs();
int32 getCurVoiceLipSyncWidth(); int32 getCurVoiceLipSyncWidth();

14
scumm/imuse_digi/dimuse_music.cpp
View file

@ -30,20 +30,6 @@ namespace Scumm {
#define COMI_STATE_OFFSET 3 #define COMI_STATE_OFFSET 3
#define COMI_SEQ_OFFSET (COMI_STATE_OFFSET + 94) #define COMI_SEQ_OFFSET (COMI_STATE_OFFSET + 94)
void IMuseDigital::refreshScripts() {
Common::StackLock lock(_mutex, "IMuseDigital::refreshScripts()");
bool found = false;
for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
if ((_track[l].used) && (_track[l].volGroupId == IMUSE_VOLGRP_MUSIC) && (!_track[l].volFadeUsed)) {
found = true;
}
}
if ((!found) && (_curMusicSeq != 0)) {
parseScriptCmds(0x2000, 0, 0, 0, 0, 0, 0, 0);
}
}
void IMuseDigital::setDigMusicState(int stateId) { void IMuseDigital::setDigMusicState(int stateId) {
int l, num = -1; int l, num = -1;

2
scumm/imuse_digi/dimuse_script.cpp
View file

@ -155,7 +155,7 @@ void IMuseDigital::parseScriptCmds(int a, int b, int c, int d, int e, int f, int
// setGroupMusicVolume(b); // setGroupMusicVolume(b);
break; break;
default: default:
warning("IMuseDigital::doCommand DEFAULT command %d", cmd); error("IMuseDigital::doCommand DEFAULT command %d", cmd);
} }
} }

2
scumm/scumm.cpp
View file

@ -1577,8 +1577,6 @@ load_game:
} }
_sound->processSoundQues(); _sound->processSoundQues();
if ((_imuseDigital) && (_gameId != GID_FT))
_imuseDigital->refreshScripts();
camera._last = camera._cur; camera._last = camera._cur;