Commit Graph

6068 Commits

Author SHA1 Message Date
James Brown
129ae93ca6 Lets try and keep this more updated from now on, hmm?
svn-id: r9606
2003-08-08 13:13:37 +00:00
Jamieson Christian
dbc42e0fb3 Revamped the GM-to-FM emulation tables.
The new tables come directly from the Adlib driver
for the original Sam & Max distro. Sam & Max using
Adlib should now sound essentially identical to
the original distro ("a few more tests"), and other
games without specific Adlib support, such as Simon,
should sound a whole lot closer to the GM tonality.
Percussion support is now comprehensive for Sam & Max
and a lot more thorough for other games.

svn-id: r9605
2003-08-08 12:06:14 +00:00
Jamieson Christian
154e872d5a Added generic send() option to MidiChannel.
This circumvents problems doing generic send()
calls to MidiDrivers that support more than
16 MIDI channels (i.e. Adlib). Because of the
way it interacts with MidiDriver, Simon could
have run into a problem if it tried to
allocate more than 15 Adlib music channels
(though this would only happen in very, VERY
rare circumstances).

Also fixed a problem with the channel
numbering scheme used by MidiDriver_Adlib,
in particular the percussion channel number.

svn-id: r9604
2003-08-08 11:54:24 +00:00
Jonathan Gray
f1a3253fa2 remove GF_LOOM
svn-id: r9603
2003-08-08 11:32:40 +00:00
Jamieson Christian
0ca58111c6 More Simon shutdown cleanup
svn-id: r9602
2003-08-08 09:48:42 +00:00
Travis Howell
47d98f94db Use shutdown() when quiting via ctrl z
svn-id: r9601
2003-08-08 09:42:38 +00:00
Jamieson Christian
456124d109 Fixed hang from double-lock of mutex
svn-id: r9600
2003-08-08 09:36:37 +00:00
Jamieson Christian
9b297a39b1 Close music engine on shutdown
svn-id: r9599
2003-08-08 09:27:52 +00:00
Jonathan Gray
101821015c remove debug printf
svn-id: r9598
2003-08-08 09:26:09 +00:00
Jonathan Gray
c94a9cf8fe fix spacing
svn-id: r9597
2003-08-08 09:10:31 +00:00
Jonathan Gray
6d1ded6992 list -h in help text
svn-id: r9596
2003-08-08 09:09:06 +00:00
Jonathan Gray
0858eed1fd add ability to specify prefix for optional libraries see help for details
svn-id: r9595
2003-08-08 09:02:49 +00:00
Jamieson Christian
8281d8ad42 Fixed type mismatch warning
svn-id: r9594
2003-08-08 07:45:41 +00:00
Jamieson Christian
4353f4531c Send All Notes Off to every channel on close
svn-id: r9593
2003-08-08 07:23:11 +00:00
Jamieson Christian
73eda504b9 Added missing break after case
svn-id: r9592
2003-08-08 07:06:46 +00:00
Max Horn
9d56a50678 work around odd cases with odd lens for 16 bit audio data
svn-id: r9591
2003-08-07 23:54:59 +00:00
Max Horn
ac6bd10c59 my code was actually right. Rather the calling code is evil, it passes us odd buffer sizes for 16 bit audio data, which of course made no sense -> I added some asserts against this
svn-id: r9590
2003-08-07 23:54:39 +00:00
Jamieson Christian
93c90f4674 Fix for Bug [780924] IMUSE: Pitchbend isn't reset when changing tracks
When scanning (not jumping) to a target location
in a different track, the current track is first
scanned to the end to update the player state
before starting into the new track.

Miscellaneous scan-related cleanup is included.

svn-id: r9589
2003-08-07 23:42:15 +00:00
Max Horn
f67b126f1d replace code in readBuffer by slightly less efficient but hopefully working code (at least it fixes an endless loop in COMI for me). I did fix the originaly bug in my optimization, and right now I clueless as to why that code isn't working as it should <sigh>. Need sleep
svn-id: r9588
2003-08-07 22:19:55 +00:00
Chris Apers
51c38eb3e8 Fix newline warning
svn-id: r9587
2003-08-07 14:57:55 +00:00
Chris Apers
88d7a918a3 No more needed ... Arisme, your turn
svn-id: r9586
2003-08-07 14:52:04 +00:00
Chris Apers
0d71a7db1b This seems to be no more used
svn-id: r9585
2003-08-07 14:37:18 +00:00
Chris Apers
d910e7b066 In fact, Nicolas, this is no more needed :)
svn-id: r9584
2003-08-07 14:33:38 +00:00
Nicolas Bacca
7d19b48670 Fix intro timing on WinCE ... guess everybody could use it but I'll leave the engine mainteners decide :p
svn-id: r9583
2003-08-06 23:49:50 +00:00
Nicolas Bacca
1c1fd05a72 Remove old tweak that can break the music when restoring now ... Chris, you should check it too :p
svn-id: r9582
2003-08-06 21:07:59 +00:00
Jamieson Christian
d8464534a5 Added comment to new macro
svn-id: r9581
2003-08-06 20:44:42 +00:00
Jamieson Christian
99716fc38e Changed readSample template function
to Fingolfin's new READSAMPLE macro.
Circumvents buggy template function
handling in MSVC6. Props to Fingolfin
for tracking this bug down by remote.

svn-id: r9580
2003-08-06 20:41:05 +00:00
Jamieson Christian
1615278ecc Upgraded IMuse::doCommand() to support more than 8 parameters.
V6 scripts can specify up to 16 parameters to be passed to
doCommand(). In most cases 8 or fewer parameters were used,
but occasional uses of 9 or 10 parameters resulted in
incorrect iMuse behavior due to lost doCommand() data.

ImTrigger was also upgraded to support 8 parameters instead
of 4, since the incorrect behavior that was observed involved
the use of triggered commands that required more than 4
parameters. Since ImTrigger data is not currently being saved
(which is bad), we do not at this time have to go to another
savegame format to support the additional ImTrigger data
(which is good).

This fix corrects a problem in the Tunnel of Love. When the
"execution scene" music finishes and the hidden door opens,
the Tunnel of Love music is supposed to start up again. In
ScummVM, it never would, do to the loss of parameters for a
trigger-based "Parameter Fade" command.

A bit of miscellaneous cleanup has also been made.

svn-id: r9579
2003-08-06 18:20:15 +00:00
Chris Apers
79a804c401 Added backends/intern.h to project tree, little config tweak
svn-id: r9578
2003-08-06 18:01:06 +00:00
Jamieson Christian
92b06a493c Tweaked debugger output to avoid wrapping, esp.
in the case of tabular output.

svn-id: r9577
2003-08-06 17:51:39 +00:00
Jamieson Christian
7453cabbbc Fix for Bug [780918] SAM: Music stops at Bumpusville
Tweaked handling of ImSetTrigger when the triggered
command starts a new song. If the song to be started
is already playing, we stop it (in preparation for
a restart) ONLY if the song containing the command
trigger is actually playing. Otherwise the restart
is likely to never occur (as is the case with the
Bumpusville mansion interior music).

svn-id: r9576
2003-08-06 17:47:29 +00:00
Max Horn
69ee268e7f some cleanup
svn-id: r9575
2003-08-06 17:13:04 +00:00
Max Horn
32107ae69a sync with 0.5.0 branch
svn-id: r9559
2003-08-06 12:28:06 +00:00
Max Horn
002f5262e3 remove obsolete warning for non-22050 Vorbis files
svn-id: r9555
2003-08-06 12:11:10 +00:00
Max Horn
3e0cd37cea get rid of GF_INDY3 again, and also remove GID_INDY3_256 and GID_INDY3_TOWNS
svn-id: r9554
2003-08-06 12:04:27 +00:00
Nicolas Bacca
845a3c5f6e Added .ini parameters
svn-id: r9553
2003-08-06 11:54:05 +00:00
Chris Apers
1a0d308e04 Fixed type mismatch error compiling palmos port
svn-id: r9552
2003-08-06 11:53:18 +00:00
Nicolas Bacca
7e2ff83e70 Fix #783732 : freeze on Pocket PC
svn-id: r9550
2003-08-06 10:06:19 +00:00
Travis Howell
de277d746c Remove unneeded double brackets
svn-id: r9548
2003-08-06 09:35:56 +00:00
Travis Howell
5dd4d3e8e4 Add GF_LOOM feature flag for loom games to reduce checks.
Will make it easier to add loom fm towns target in future.

svn-id: r9547
2003-08-06 09:30:48 +00:00
Travis Howell
e4e9538038 Add GF_INDY3 feature flag for indy3 games to reduce checks
Remove GF_ADLIB_DEFAULT since it is no longer used

svn-id: r9546
2003-08-06 09:10:19 +00:00
Jonathan Gray
8b3ac82f35 update man page a bit, we should probably have another one for the config file at some point as well
svn-id: r9544
2003-08-06 08:55:23 +00:00
Chris Apers
789628bb18 Changed
svn-id: r9543
2003-08-06 08:37:52 +00:00
Chris Apers
249982f721 Added --demo-mode option
svn-id: r9542
2003-08-06 08:36:33 +00:00
Chris Apers
dc166df2ba Get rid of the bad onehalf array (thx to Mark Fechtner)
svn-id: r9540
2003-08-06 08:33:38 +00:00
Chris Apers
a3629f37cf Disable SWORD2
svn-id: r9539
2003-08-06 08:31:36 +00:00
Chris Apers
56414ea73d Added --demo-mode option
svn-id: r9538
2003-08-06 08:29:46 +00:00
Jonathan Gray
7061819cb8 correct version string
svn-id: r9537
2003-08-06 08:07:01 +00:00
Travis Howell
adbb25cdc1 snmidemo is adlin resources only, other than intro.
snmdemo is midi resources only, double checked

svn-id: r9535
2003-08-06 07:58:34 +00:00
Travis Howell
43a1d35064 Reverted too much
Add note about missing code in simon

svn-id: r9531
2003-08-06 05:47:49 +00:00