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

Merged o_playSFX() into o1_playEffect().

Browse source 
svn-id: r21751
This commit is contained in:
Torbjörn Andersson 2006-04-10 07:48:58 +00:00
parent 2695cb6f88
commit d76cbb8439
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/simon/items.cpp
View file

@ -1280,7 +1280,12 @@ void SimonEngine::o1_screenTextMsg() {
void SimonEngine::o1_playEffect() {
// 163: play sound
o_playSFX(getVarOrWord());
uint sound_id = getVarOrWord();
if (getGameId() == GID_SIMON1DOS)
playSting(sound_id);
else
_sound->playEffects(sound_id);
}
void SimonEngine::o1_getDollar2() {
@ -1974,13 +1979,6 @@ void SimonEngine::o_sync(uint a) {
_lockWord &= ~0x8000;
}
void SimonEngine::o_playSFX(uint sound_id) {
if (getGameId() == GID_SIMON1DOS)
playSting(sound_id);
else
_sound->playEffects(sound_id);
}
void SimonEngine::o_setTextColor(uint color) {
WindowBlock *window;

1
engines/simon/simon.h
View file

@ -583,7 +583,6 @@ protected:
uint getOffsetOfChild2Param(SubObject *child, uint prop);
void o_setTextColor(uint color);
void o_playSFX(uint a);
void o_pathfind(int x, int y, uint var_1, uint var_2);
void o_mouseOn();
void o_mouseOff();