Commit graph

464 commits

Author SHA1 Message Date
Travis Howell
f2e8033edc Adjust music timer for game with no music support.
svn-id: r9913
2003-08-30 01:32:32 +00:00
Travis Howell
a917313307 Adjust music timer
svn-id: r9911
2003-08-29 09:01:19 +00:00
Travis Howell
ef4fdd03f0 My last commit was wrong, this is correct solution.
svn-id: r9908
2003-08-29 07:07:55 +00:00
Travis Howell
bed0061362 Fix verbs been shown in cutscenes in v1-v2 games if loading/saving during cutscene.
svn-id: r9907
2003-08-29 06:53:00 +00:00
Travis Howell
33f9cb35a3 Change zak room color remapping, so it work correctly after load/save in room with remapped colors.
svn-id: r9905
2003-08-29 06:46:12 +00:00
Jamieson Christian
cec02390ed Fix for bug [770687] MI1: palette effect missing
Added support for CC resources in small-header
games. Right now this is enabled for monkeyvga
only. loomcd has CC resources but they don't
make any sense, and the game doesn't use palette
effects anyway.

svn-id: r9899
2003-08-29 03:35:15 +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
Travis Howell
6071e79dce Leave small_header color cycle resource disabled for now, since it needs additioal support.
svn-id: r9887
2003-08-28 06:38:03 +00:00
Travis Howell
06d07054c3 Fix room palette issues in small_header games.
Fix is only for EGA games so far.

svn-id: r9873
2003-08-27 01:12:18 +00:00
Torbjörn Andersson
f3675261a9 Actually, we used to draw blast text after blast objects. I changed the
order to fix the Full Throttle end credits. I guess I should have added a
comment about that. :-)

svn-id: r9866
2003-08-26 06:35:38 +00:00
Max Horn
10d4af4eae fix for bug #782727 (COMI: no sentence line while inventory is shown) by drawing blast text after blast objects
svn-id: r9853
2003-08-24 21:58:16 +00:00
Jonathan Gray
446ca58580 crude fix for bug #786995 stop arrow keys being sent to scripts as they are currently stolen by the keyboard cursor control stuff. I will soon either gut the keyboard cursor stuff or make it non default as it breaks several things
svn-id: r9809
2003-08-21 15:33:25 +00:00
Travis Howell
d6105a3064 Cleanup v1/v2 color settings for sentance/inventory/verb area.
Add highlight color for v1 maniac

svn-id: r9774
2003-08-19 04:15:14 +00:00
Jonathan Gray
c21fd14df8 change loomtowns target a tad
svn-id: r9749
2003-08-18 04:53:54 +00:00
Jonathan Gray
99c677f2a3 add loom towns target
svn-id: r9747
2003-08-18 02:02:43 +00:00
Travis Howell
bbbca4f8fe Fix text display in verb/inventory area in demo mode of V1 maniac mansion
svn-id: r9734
2003-08-17 07:02:33 +00:00
Travis Howell
53d1db8cae Fix regressions in MI1 Amiga
Revert last change to MI1 demo fix and make it monkeyega target only.

svn-id: r9732
2003-08-17 02:34:34 +00:00
Jamieson Christian
0914e57d21 Changed fix for hanging MI1 EGA Demo after
finding GFX regressions in Indy3. New fix
runs exit script immediately when nuking
the resource for the current room, and
resets the current room to 0 (nothing).

Again, a warning is output in case other
cases of nuking the current room are found
and have undesirable behavior as a result
of this change.

svn-id: r9731
2003-08-16 21:45:00 +00:00
Jamieson Christian
d7fae3d1cb More corrections to the VAR_MUSIC_TIMER
computations, mostly to produce the
exptected output with AD resources.

svn-id: r9730
2003-08-16 17:08:22 +00:00
Travis Howell
293ba87bbf Allow right mouse click to skip cutscene (Instead of both) in old games, since originals were this way.
svn-id: r9724
2003-08-16 14:24:17 +00:00
Jamieson Christian
121b00a6f7 Corrected timing mechanism for RO music streams.
RO streams have built-in timer markers (the
unknown 0xA0 mentioned in FR [742249]) that
override automated methods of updating
VAR_MUSIC_TIMER. Since these timer markers
do not seem to be present in AD resources, the
old mechanism is used if MD_ADLIB is the current
MidiDriver.

svn-id: r9720
2003-08-16 09:34:19 +00:00
Chris Apers
8281c2eecc Revert to old value
svn-id: r9719
2003-08-16 09:20:24 +00:00
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