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

only moved stuff (to group sound related stuff)

Browse source 
svn-id: r7288
This commit is contained in:
Max Horn 2003-05-03 17:50:04 +00:00
parent 6d3ba60745
commit 7e58986519
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
scumm/script_v5.cpp
View file

@ -1292,15 +1292,6 @@ void Scumm_v5::o5_equalZero() {
o5_jumpRelative();
}
void Scumm_v5::o5_isSoundRunning() {
int snd;
getResultPos();
snd = getVarOrDirectByte(0x80);
if (snd)
snd = _sound->isSoundRunning(snd);
setResult(snd);
}
void Scumm_v5::o5_jumpRelative() {
_scriptPointer += (int16)fetchScriptWord();
}
@ -1996,6 +1987,32 @@ void Scumm_v5::o5_setVarRange() {
} while (--a);
}
void Scumm_v5::o5_startMusic() {
_sound->addSoundToQueue(getVarOrDirectByte(0x80));
}
void Scumm_v5::o5_startSound() {
_vars[VAR_MUSIC_TIMER] = 0;
_sound->addSoundToQueue(getVarOrDirectByte(0x80));
}
void Scumm_v5::o5_stopMusic() {
_sound->stopAllSounds();
}
void Scumm_v5::o5_stopSound() {
_sound->stopSound(getVarOrDirectByte(0x80));
}
void Scumm_v5::o5_isSoundRunning() {
int snd;
getResultPos();
snd = getVarOrDirectByte(0x80);
if (snd)
snd = _sound->isSoundRunning(snd);
setResult(snd);
}
void Scumm_v5::o5_soundKludge() {
int items[16];
int i;
@ -2020,10 +2037,6 @@ void Scumm_v5::o5_soundKludge() {
_sound->soundKludge(items, num);
}
void Scumm_v5::o5_startMusic() {
_sound->addSoundToQueue(getVarOrDirectByte(0x80));
}
void Scumm_v5::o5_startObject() {
int obj, script;
int data[16];
@ -2054,15 +2067,6 @@ void Scumm_v5::o5_startScript() {
runScript(script, a, b, data);
}
void Scumm_v5::o5_startSound() {
_vars[VAR_MUSIC_TIMER] = 0;
_sound->addSoundToQueue(getVarOrDirectByte(0x80));
}
void Scumm_v5::o5_stopMusic() {
_sound->stopAllSounds();
}
void Scumm_v5::o5_stopObjectCode() {
stopObjectCode();
}
@ -2081,10 +2085,6 @@ void Scumm_v5::o5_stopScript() {
stopScriptNr(script);
}
void Scumm_v5::o5_stopSound() {
_sound->stopSound(getVarOrDirectByte(0x80));
}
void Scumm_v5::o5_stringOps() {
int a, b, c, i;
byte *ptr;