diff options
| author | Jochen Hoenicke | 2003-08-15 16:40:17 +0000 |
|---|---|---|
| committer | Jochen Hoenicke | 2003-08-15 16:40:17 +0000 |
| commit | 3b75fa8d3ce712b0c696eb586f4cd341ad1fb345 (patch) | |
| tree | feaab2345e69502a85488bf2492405aee1e06df7 /scumm | |
| parent | a892474a4f53ae5c0755bb4b86092b79f7faccab (diff) | |
| download | scummvm-rg350-3b75fa8d3ce712b0c696eb586f4cd341ad1fb345.tar.gz scummvm-rg350-3b75fa8d3ce712b0c696eb586f4cd341ad1fb345.tar.bz2 scummvm-rg350-3b75fa8d3ce712b0c696eb586f4cd341ad1fb345.zip | |
Changed on_timer frequency in adlib so V3 SFX are correctly timed.
Changed V3 conversion code to adapt to the new (correct) speed.
svn-id: r9712
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/resource.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 6163f89a85..abb621c754 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -1198,7 +1198,6 @@ int Scumm::convertADResource(int type, int idx, byte * src_ptr, int size) { return 1; } - /* This is a sfx resource. First parse it quickly to find the parallel * tracks. */ @@ -1369,7 +1368,7 @@ int Scumm::convertADResource(int type, int idx, byte * src_ptr, int size) { /* FIXME: delay factor found by try and error */ - delay = (delay + 1) * 240 / 13; + delay = delay * 8; { int freq = ((current_instr[ch][1] & 3) << 8) @@ -1387,8 +1386,8 @@ int Scumm::convertADResource(int type, int idx, byte * src_ptr, int size) { note += freq2note[freq - 0x80]; debug(4, "Note: %d", note); - if (note < 0) - note = 0; + if (note <= 0) + note = 1; else if (note > 127) note = 127; |