diff options
| author | Torbjörn Andersson | 2004-10-19 18:45:42 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-10-19 18:45:42 +0000 |
| commit | f4443646e51c86656a82eabf6a9e592fb8a842e5 (patch) | |
| tree | 158b3c9217802e725032bb7fb346091e10067c02 | |
| parent | 1fa79b09dea9f19fab2e321ef630db8309abfcc9 (diff) | |
| download | scummvm-rg350-f4443646e51c86656a82eabf6a9e592fb8a842e5.tar.gz scummvm-rg350-f4443646e51c86656a82eabf6a9e592fb8a842e5.tar.bz2 scummvm-rg350-f4443646e51c86656a82eabf6a9e592fb8a842e5.zip | |
Oops, now it plays the correct music again, I hope. The sound effects seem
a bit better now, too. At least the crowd is no longer cheering when the
fair is closed.
svn-id: r15617
| -rw-r--r-- | saga/resnames.h | 1 | ||||
| -rw-r--r-- | saga/sfuncs.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/saga/resnames.h b/saga/resnames.h index 3922267255..ec75d01e14 100644 --- a/saga/resnames.h +++ b/saga/resnames.h @@ -156,7 +156,6 @@ namespace Saga { // TODO: These are only in the CD version, and I can't find them in the source // code we got. Someone needs to verify these to get the correct values. -// They appear to be a bit off right now. #define FX_CROWD_01 56 #define FX_CROWD_02 57 diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index 674d3a0f82..9cbda863e8 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -723,7 +723,7 @@ int Script::SF_getActorY(R_SCRIPTFUNC_PARAMS) { // Script function #63 (0x3F) int Script::SF_playMusic(R_SCRIPTFUNC_PARAMS) { - SDataWord_T param = thread->pop(); + SDataWord_T param = thread->pop() + 9; if (param >= 9 && param <= 34) _vm->_music->play(param); @@ -806,7 +806,7 @@ static struct { // Script function #70 (0x46) int Script::SF_playSound(R_SCRIPTFUNC_PARAMS) { - SDataWord_T param = thread->pop() - 14; + SDataWord_T param = thread->pop() - 13; if (/* param >= 0 && */ param < ARRAYSIZE(sfxTable)) _vm->_sndRes->playSound(sfxTable[param].res, sfxTable[param].vol); |