diff options
| author | Travis Howell | 2005-01-24 10:07:17 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-01-24 10:07:17 +0000 |
| commit | 63ebdfa6c74f15b31f7bdd8e1c6dd15fff7ead77 (patch) | |
| tree | 9825a2e594ccaec119e7bc98205db61cad12c62c | |
| parent | ac30ac9dbd802bf781812d217e5cd8ce673bbbb9 (diff) | |
| download | scummvm-rg350-63ebdfa6c74f15b31f7bdd8e1c6dd15fff7ead77.tar.gz scummvm-rg350-63ebdfa6c74f15b31f7bdd8e1c6dd15fff7ead77.tar.bz2 scummvm-rg350-63ebdfa6c74f15b31f7bdd8e1c6dd15fff7ead77.zip | |
Correct sound offset size
svn-id: r16628
| -rw-r--r-- | scumm/script.cpp | 4 | ||||
| -rw-r--r-- | scumm/sound.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index a64478f091..af3205f13a 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -499,9 +499,11 @@ int ScummEngine::readVar(uint var) { if (var == VAR_NOSUBTITLES) { if (_gameId == GID_LOOM256 || _features & GF_HUMONGOUS) return !ConfMan.getBool("subtitles"); - else if (_gameId == GID_SAMNMAX) + else if (_gameId == GID_SAMNMAX) { // Used as VAR_SUBTITLES in Sam & Max during Conroy Bumpus song + printf("Subtitles %d\n", ConfMan.getBool("subtitles")); return ConfMan.getBool("subtitles"); + } } checkRange(_numVariables - 1, 0, var, "Variable %d out of range(r)"); diff --git a/scumm/sound.h b/scumm/sound.h index 4e401ab733..c2b6f0db70 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -62,7 +62,7 @@ protected: struct { int16 sound; - int16 offset; + int32 offset; int16 channel; int16 flags; } _soundQue2[10]; |