Commit graph

214 commits

Author SHA1 Message Date
Max Horn
d7660a2662 introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
svn-id: r10571
2003-10-03 18:33:57 +00:00
Max Horn
3f55f2669d renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace)
svn-id: r10549
2003-10-02 22:42:03 +00:00
Jamieson Christian
db798a3e7d Fix for Bug [815851] DOTT: MT-32 MIDI priority
Favor 'ROL ' resources over 'GMD ' if
--native-mt32 is selected.

svn-id: r10537
2003-10-02 14:37:40 +00:00
Jamieson Christian
9d93e97ed4 Support for FMTowns versions of MI1/2,
submitted by Hibernatus.

svn-id: r10511
2003-09-30 17:53:42 +00:00
Jamieson Christian
d91278198b Fix for Bug [805593] MI2: Music stops in LeChuck's fortress
Implemented _cmd_queue save/load. In addition to requiring
_cmd_queue information, this bug arises from a rare assumption
that sound resources are loaded in memory even though they
aren't currently playing. Therefore, a list of sound resources
loaded in memory is included in the savegame, so that all
relevant sound resources are reloaded when the savegame is
loaded. This also fixes an unreported music bug in S&M when
saving a game while outside the Bumpusville mansion.

As a result of savegame format modifications, we are now at
savegame version 23.

svn-id: r10254
2003-09-14 20:34:48 +00:00
Jochen Hoenicke
c902282a05 A hack for bug #770581. This makes the sound much closer to the
original, but I think to make it completely right a bigger change to
the adlib backend would be necessary.

svn-id: r10251
2003-09-14 15:03:12 +00:00
Max Horn
81f10baa68 cleanup
svn-id: r10169
2003-09-11 10:32:15 +00:00
Travis Howell
87ff23ddc1 Correct RO sound resource size for blocked games.
svn-id: r10146
2003-09-10 03:50:03 +00:00
Max Horn
6adb8560a8 some initial work on Mac0 support. Everybody feel free to pick up here and implement the rest <g>
svn-id: r10119
2003-09-09 01:21:42 +00:00
Max Horn
24560608ed cleanup
svn-id: r10118
2003-09-09 00:20:55 +00:00
Max Horn
821faf9e03 added convertMac0Resource (which doesn't do anything yet, but is the place we can add Mac0 support in later); factored out some common code in convertADResource; fixed memory leak when convertADResource was called; misc cleanup
svn-id: r10117
2003-09-09 00:13:19 +00:00
Max Horn
697ac22c32 mention some GM instrument numbers
svn-id: r10116
2003-09-08 23:35:36 +00:00
Max Horn
b8d72d8854 added comment describing Mac0 format
svn-id: r10115
2003-09-08 23:18:11 +00:00
Max Horn
5ecee0f046 fix an overflow
svn-id: r10095
2003-09-08 16:48:34 +00:00
Max Horn
c5a3c1235c some cleanup
svn-id: r10084
2003-09-08 11:29:57 +00:00
Max Horn
361c3b95d5 some cleanup; clarified isSoundInUse semantics and the difference between IMuse::get_sound_active and IMuse::getSoundStatus; added lots of const qualifiers to IMuse; rewrote IMuseInternal::getSoundStatus (hopefully not breaking it); added MusicEngine::getSoundStatus
svn-id: r10069
2003-09-07 17:14:56 +00:00
Travis Howell
c3d61acd5c Remove warning
svn-id: r10000
2003-09-05 07:38:36 +00:00
Travis Howell
3187b565dd Add atarist and macintosh options, since there seem to be no way to detect version been used.
svn-id: r9999
2003-09-05 07:36:05 +00:00
Travis Howell
f76725b38f Update comment
svn-id: r9916
2003-08-30 08:03:01 +00:00
Jonathan Gray
e32f17d803 don't try to read objectRoomTable for HEv7 games right now
svn-id: r9898
2003-08-29 02:45:38 +00:00
Jonathan Gray
176803cb90 make the 2nd gen windows based humongous games that have things like a different layout in the MAXS block at least start the bootscript, added pjs-demo target to test with
svn-id: r9897
2003-08-29 02:39:05 +00:00
Jonathan Gray
62f94f15be clean up humongous v7 index file block handling
svn-id: r9893
2003-08-28 14:25:29 +00:00
Travis Howell
cde3b3dc6d Load older Color Cycling resource.
Still need to work out resource differences

svn-id: r9883
2003-08-28 01:10:36 +00:00
Travis Howell
b113720a6d Work around for sound resource in ST versions.
svn-id: r9824
2003-08-23 07:27:59 +00:00
Jamieson Christian
535b95fffc Fixed tempo value for Indy3 AD resources. Despite
the comment in the source, the disasm value DOES
sound closer to the original than the alternative
value that came from who-knows-where. The value
being used rendered too slow a tempo.

svn-id: r9823
2003-08-22 20:24:06 +00:00
Jamieson Christian
bcd1f49125 More tweaks to the PPQN and tempo of AD resources.
Loom, Indy3 and monkeyvga are now all running
at the right tempo and returning appropriate
quarter note counts for the script timers.
Fixes a sync regression with the Indy3 opening
sequence under -eadlib.

Ask me if I care that these numbers may not
precisely match the disasm.

svn-id: r9813
2003-08-22 02:24:55 +00:00
Travis Howell
f16aec61f0 Fix speedy music regression in monkeyega/vga/pass.
Add unique tag to sfx when converting AD resources, to solve sfx cutting off music issue in monkeyega/vga.

svn-id: r9801
2003-08-20 15:19:23 +00:00
Jochen Hoenicke
eb5f05fab3 More adlib tempo tweaks
svn-id: r9742
2003-08-17 16:32:36 +00:00
Jamieson Christian
61162bf359 Semantics correction
svn-id: r9729
2003-08-16 17:05:04 +00:00
Jochen Hoenicke
6db31f464f Some Tempo changes for adlib sounds
svn-id: r9725
2003-08-16 14:30:23 +00:00
Travis Howell
2750eabcd5 Add a comment
svn-id: r9714
2003-08-16 06:01:10 +00:00
Jochen Hoenicke
3b75fa8d3c 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
2003-08-15 16:40:17 +00:00
Jamieson Christian
6f50c85220 Fixed problem with Adlib sounds being generated
when using -epcspk or -epcjr with V6 games that
don't have PC speaker resources.

svn-id: r9701
2003-08-15 07:45:21 +00:00
Jonathan Gray
6b405587f2 add hack for string resource idx numbers greater than max for humongous games
svn-id: r9698
2003-08-15 05:35:12 +00:00
Travis Howell
50482ded7b Fix bad check
svn-id: r9689
2003-08-14 10:46:46 +00:00
Travis Howell
57133e526f Add roland support for loom )ega)
Enable roland support for monkeyega

svn-id: r9688
2003-08-14 10:28:16 +00:00
Travis Howell
7faa06aecd Revert bad change
svn-id: r9687
2003-08-14 09:27:33 +00:00
Travis Howell
6d12722899 Rearrange to be safer
svn-id: r9686
2003-08-14 08:47:47 +00:00
Jamieson Christian
3a39c653af Added support for Roland MT-32 music tracks
in monkeyvga/ega. Tested in monkeyvga, but
not in monkeyega yet. There are still wrinkles
to work out, but the parser for the new format
is in and hooked up.

svn-id: r9684
2003-08-14 08:26:59 +00:00
Travis Howell
8781f5e6f6 Add RO sound reosurce detection to small_header games
svn-id: r9682
2003-08-14 06:28:54 +00:00
Travis Howell
eba32fbd0c Add fixme comment
svn-id: r9662
2003-08-13 16:21:35 +00:00
Travis Howell
679bc2d271 Adds finals changes for choice of sound formats in older games.
Only works wit monkeyvga, since ScummVM has it set as version 4.
Remove some old debugging comments

svn-id: r9659
2003-08-13 15:37:28 +00:00
Jamieson Christian
fb62ba61ca Added PC Speaker and PCjr command line options,
in preparation for Kirben's addition of WA support
for games that already have AD tracks.

svn-id: r9656
2003-08-13 14:08:21 +00:00
Travis Howell
936db5decc Remove unused var.
svn-id: r9653
2003-08-13 01:59:17 +00:00
Travis Howell
de3f72c676 temp. fixme for music in monkeyega/vga
svn-id: r9652
2003-08-13 01:46:48 +00:00
Travis Howell
b198fbc3bb Add adlib music for indy3ega/loom and adlib sfx, patch #770862
svn-id: r9649
2003-08-12 16:09:41 +00:00
Travis Howell
02d8fa584d A nuke wasn't required after all
svn-id: r9630
2003-08-11 02:06:35 +00:00
Travis Howell
0d5875c754 nuke old resource again
svn-id: r9481
2003-08-05 07:54:10 +00:00
Travis Howell
8bf012d966 Add adlib music improvements for indy3/monkeyega/monkeyvga and cleanups from patch #770862
svn-id: r9480
2003-08-05 05:21:57 +00:00
Max Horn
7caa1a0c9e removed _encbyte (it's only used locally)
svn-id: r9252
2003-07-28 16:55:06 +00:00