Commit Graph

484 Commits

Author SHA1 Message Date
Max Horn
07e8084eee replaced all use of scale items with scale slots. This allowed me to get rid of two big FIXME's, and might fix other scaling bugs in FT/DIG
svn-id: r10140
2003-09-09 17:29:22 +00:00
Max Horn
90ec1dc34e make even more use of Scumm::_musicEngine; added MusicEngine::setMasterVolume
svn-id: r10097
2003-09-08 17:06:44 +00:00
Max Horn
f23a34c9e5 renamed VersionSettings -> TargetSettings and also renamed some of its members; added GameDetector::findTarget; made launcher use that new method; some initial preparations for Plugin code
svn-id: r10092
2003-09-08 15:38:34 +00:00
Chris Apers
3156f0dd2f Reduce PalmOS data segement
svn-id: r10083
2003-09-08 08:54:37 +00:00
Travis Howell
6444ebf5dc Amiga V3 music updates from unused.
svn-id: r10076
2003-09-08 01:42:24 +00:00
Max Horn
0012f7fa96 added common base class MusicEngine for iMuse/iMuseDigital/Player_V123 (initial stab, more work to follow)
svn-id: r10066
2003-09-07 16:16:19 +00:00
Travis Howell
9de8a0cfa9 Add music player for Amiga versions of indy3ega/loom from unused.
Revert last change to common.rules for now, it broke compile.

svn-id: r10061
2003-09-07 07:23:20 +00:00
Max Horn
1f59b15f91 implemented FOA keyboard fighting
svn-id: r10052
2003-09-06 23:29:35 +00:00
Travis Howell
8147719ff2 Remove sound looping hack for v2 amiga games.
svn-id: r10030
2003-09-06 01:44:29 +00:00
Travis Howell
af78f4dfae Don't let Amiga and Platform options cancel each other out for Amiga support.
svn-id: r10029
2003-09-06 01:20:15 +00:00
Travis Howell
47215f39dd Add to config as int for now.
svn-id: r10012
2003-09-05 16:30:05 +00:00
Travis Howell
93d262a01f Oops
svn-id: r10008
2003-09-05 15:53:20 +00:00
Travis Howell
8da8c27776 Add mac check.
svn-id: r10005
2003-09-05 15:25:31 +00:00
Travis Howell
d100361876 Use --platform option, instead of system specific options.
Needs config support added.

svn-id: r10002
2003-09-05 10:53:57 +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
16f0cce0bb Leave SPK resources in monkey1 disabled too.
svn-id: r9993
2003-09-04 15:24:58 +00:00
Travis Howell
2f800e4b32 monkey has no native midi resources and SPK isn't support yet.
svn-id: r9992
2003-09-04 11:40:12 +00:00
Torbjörn Andersson
aa3687c527 Gave the "monkey" target the same sound flags as the "monkey1" target. At
least I think they refer to the same game, just with differently named data
files. This should fix bug #800378 ("MI1: no adlib with monkey target
(regression)").

Should the same change be made to the "game" (Monkey Island 1, SegaCD
version) target, or is that one too different?

svn-id: r9991
2003-09-04 11:33:46 +00:00
Jonathan Gray
a0f6948150 add a bunch of known targets for some of the newer humongous games, maybe we should move the target list out into another file? there are a few more to add after they are known as well...
svn-id: r9987
2003-09-03 10:34:04 +00:00
Travis Howell
e9727c157e Minor cleanup of color cycle resource loading
svn-id: r9949
2003-09-01 06:11:41 +00:00
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