diff options
| author | Travis Howell | 2002-10-31 09:38:02 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-10-31 09:38:02 +0000 |
| commit | 8650ff52943cdb2d8adf761e0ca069d3b8e2a90a (patch) | |
| tree | 08b363b177f864c36fc6b8d3dc8c228c45104c95 /simon | |
| parent | 9ffc268db5fb7aff51108f98cc25ffd9c59c01b4 (diff) | |
| download | scummvm-rg350-8650ff52943cdb2d8adf761e0ca069d3b8e2a90a.tar.gz scummvm-rg350-8650ff52943cdb2d8adf761e0ca069d3b8e2a90a.tar.bz2 scummvm-rg350-8650ff52943cdb2d8adf761e0ca069d3b8e2a90a.zip | |
Fix voice in simon 1/2 dos talkie again.
Disable code causing movement problems in simon 2 games
svn-id: r5363
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 7feb51c21c..65bb03f520 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2883,9 +2883,10 @@ void SimonState::o_pathfind(int x, int y, uint var_1, uint var_2) uint x_diff, y_diff; uint best_i = 0, best_j = 0, best_dist = 0xFFFFFFFF; - if (_game & GAME_SIMON2) { - x += _x_scroll * 8; - } +/* Causes movement problems in Simon 2 games, often unable to move left */ +// if (_game & GAME_SIMON2) { +// x += _x_scroll * 8; +// } prev_i = 21 - _variableArray[12]; for (i = 20; i != 0; --i) { @@ -4812,7 +4813,7 @@ void SimonState::playVoice(uint voice) _mixer->playRaw(&_voice_sound, buffer, data[1], READ_LE_UINT32(&wave_hdr.samples_per_sec), SoundMixer::FLAG_UNSIGNED); - } else if (_voice_type == FORMAT_WAV) { /* VOC audio */ + } else if (_voice_type == FORMAT_VOC) { /* VOC audio */ VocHeader voc_hdr; VocBlockHeader voc_block_hdr; uint32 size; |