Commit Graph

442 Commits

Author SHA1 Message Date
Jamieson Christian
78fba0a853 Changed VAR_SOUNDCARD to 0 for MD_NULL MidiDriver,
and 1 for PC speaker and PCjr. This fixes a hang
in LoomCD if the default MidiDriver happens to be
a native driver. (For some reason the CD version
still has script variations based on whether a
Roland soundcard was selected. WTH?) LoomCD now
always reverts to MD_NULL, so VAR_SOUNDCARD will
always be set appropriately.

svn-id: r9716
2003-08-16 07:19:28 +00:00
Travis Howell
b82c80a085 Typo
svn-id: r9709
2003-08-15 15:10:19 +00:00
Travis Howell
7d11516c9b Fix monkey2 missing sfx regression
svn-id: r9708
2003-08-15 14:41:28 +00:00
Jamieson Christian
e1bc6493d8 Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible
list of music types supported. This was done because now
PC speaker support must be treated separately, along with
Adlib and native (GM/MT32) support.

This fixes a problem with games that don't support PC speaker
(including V5 games that don't parse SPK resources yet)
being run with -epcspk or -epcjr. Those games now properly
switch to -enull so that music resources still get parsed
and music/script synchronization mechanisms don't break.

svn-id: r9703
2003-08-15 10:19:24 +00:00
Jochen Hoenicke
fa457b95c1 Don't create imuse for v1 and v2 games (otherwise getSoundStatus doesn't work).
PCjr support for V1 games, bug fix in speaker support.
set_pcjr is now called by Player_V2 constructor according to midi driver.
Renaming of member variables to begin with an underscore.

svn-id: r9692
2003-08-14 19:41:40 +00:00
Jonathan Gray
413f09eff5 add maniacnes target, rather prelimary so people would be well advised not to add to compatibility at this point
svn-id: r9690
2003-08-14 11:40:50 +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
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
cd40c899b2 Inital support for v1 maniac sound from Hoenicke
Had to move music init for v1/v2 games to get this working

svn-id: r9675
2003-08-14 02:28:19 +00:00
Jamieson Christian
2ad09e7857 Fix monkeyvga hang when using -epcspk/pcjr
svn-id: r9665
2003-08-13 17:18:31 +00:00
Travis Howell
00625da3c5 Ooops
svn-id: r9661
2003-08-13 15:50:56 +00:00
Travis Howell
89a181492d Remove warning that shouldn't have been committed
svn-id: r9660
2003-08-13 15:42:04 +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
603f8b8e3a Give pass its own id
svn-id: r9654
2003-08-13 02:21:36 +00:00
Torbjörn Andersson
5052770213 Allowed derefActor() and derefActorSafe() to treat actor 0 as a valid actor
since the original interpreters appear to have allowed it. This fixes bug
#786380 ("FOA - FISTS, script crash in Crete").

I do not know what the purpose of actor 0 was in the original. Either it's
a no-op, or it's used to store actor default values.

Note that in the FOA case the room-33-200 script will loop - at least with
the provided savegame - until you leave the room. However, this is quite
harmless.

svn-id: r9650
2003-08-12 16:43:43 +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
Jamieson Christian
e8d04067a0 Fix for Bug [785373] SAM: Overlapping music at Bigfoot convention
Included the ImDeferredCommand list when checking for
sounds that have been queued to play. Also added
sound queue processing between execution of exit script
and entry script. In the case of this bug, the entry
script required that the iMuse state be fully up to
date, including last-moment changes from the previous
exit script.

svn-id: r9622
2003-08-10 11:44:43 +00:00
Jonathan Gray
cb1015730f remap F1 to F5 for comi so people don't get the broken in game menu
svn-id: r9613
2003-08-10 06:10:07 +00:00
Jonathan Gray
f1a3253fa2 remove GF_LOOM
svn-id: r9603
2003-08-08 11:32:40 +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
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
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
Max Horn
75db41750e getting rid of g_mixer; removing lots of whitespace
svn-id: r9527
2003-08-05 23:58:24 +00:00
Max Horn
59bd4cb493 cleanup
svn-id: r9509
2003-08-05 17:50:06 +00:00
Travis Howell
e85cf7dae7 Revert
svn-id: r9500
2003-08-05 15:52:53 +00:00
Travis Howell
b11a1cd20f This sam and max demo includes midi tracks
svn-id: r9499
2003-08-05 15:21:50 +00:00
Travis Howell
5ba31343dd Humongous Games should use native midi drivers if available, since music resources are MIDI type.
svn-id: r9483
2003-08-05 11:19:59 +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
103112dd3d removed OSystem::set_mouse_pos (I hope I didn't break any backends, but if I did it should be trivial to get them working again)
svn-id: r9391
2003-08-02 00:36:38 +00:00
Jonathan Gray
b9cf579491 more descriptive title for mac ft demo
svn-id: r9353
2003-08-01 01:01:28 +00:00
Max Horn
7240c7df18 added support for FT mac demo
svn-id: r9351
2003-07-31 22:57:04 +00:00
Max Horn
1bcdcffc7d spelling (bug #781028)
svn-id: r9342
2003-07-31 18:55:29 +00:00
Paweł Kołodziejski
e5e117006a back disable warnings into stdafx.h, vc6 is lack of warnings support
svn-id: r9337
2003-07-31 18:35:01 +00:00
Jamieson Christian
c5de745580 Disabled unknown pragma warning in MSVC-6.
svn-id: r9320
2003-07-31 06:47:05 +00:00
Max Horn
26d05c0190 the VC warning for unknown pragmas is now gloabally disabled, no need to work around it locally
svn-id: r9300
2003-07-30 18:40:28 +00:00
Travis Howell
11aa36ff90 Add option for the demo included in Maniac Mansion (Classic version)
svn-id: r9279
2003-07-29 12:13:39 +00:00
Max Horn
5c75ec90e7 no need to zero these variables twice
svn-id: r9254
2003-07-28 16:56:52 +00:00
Max Horn
7caa1a0c9e removed _encbyte (it's only used locally)
svn-id: r9252
2003-07-28 16:55:06 +00:00
Max Horn
d592095fb9 Patch #715991: Quit Confirmation Dialog (feature request #642721) with some tweaks by me
svn-id: r9210
2003-07-28 01:36:16 +00:00
Torbjörn Andersson
3b033956aa Changed "SCALLING" to "SCALING".
svn-id: r9134
2003-07-22 20:53:01 +00:00
Max Horn
1ba7012969 fix for bug #770704
svn-id: r9115
2003-07-22 01:03:10 +00:00
Nicolas Bacca
d79ae6f1f2 Fix for #775275 : debugger support on WinCE
svn-id: r9114
2003-07-21 22:30:15 +00:00
Max Horn
0a334bf269 Fix for bug #770690 and bug #774783
svn-id: r9110
2003-07-21 21:59:07 +00:00
Paweł Kołodziejski
b54dee99a5 fixed warnings
svn-id: r9096
2003-07-20 19:19:45 +00:00
Travis Howell
43ba55e308 Revert my bad code
svn-id: r9094
2003-07-20 16:02:17 +00:00
Max Horn
a6afa09161 fix for bug #758542
svn-id: r9088
2003-07-20 01:09:42 +00:00
Max Horn
c7958d8d8b merged checkKeyHit/convertKeysToClicks/getKeyInput into processKbd - their separation served no purpose but made it much harder to understand the code. Also, this opens up possibilities to cleanup the code
svn-id: r9085
2003-07-20 00:02:24 +00:00