libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,646 Commits 5 Branches 5 Tags 1.8 GiB
f6ecb2e95d
Commit Graph

2745 Commits

Author SHA1 Message Date
Travis Howell
e37c930533 Add change ot fix pallete issue in 256 color small_header games 
svn-id: r9874
 2003-08-27 03:54:50 +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
Travis Howell
b91c182571 Revert v1 zak face costume color nack to 8, since palette is fixed. 
svn-id: r9870
 2003-08-26 16:09:09 +00:00
Travis Howell
63e89e5882 Fix room colors in v1 zak 
svn-id: r9869
 2003-08-26 15:56:37 +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
6d4475cf04 cleanup 
svn-id: r9865
 2003-08-25 21:00:12 +00:00
Max Horn
52534e2cc3 fix actor position in V1 games (by eyeballing the original in dosbox); still seems to be off 1 pixel vertically (?), and actors still leave dirt 
svn-id: r9864
 2003-08-25 20:57:36 +00:00
Max Horn
8977d6ce07 v1 masking fixes 
svn-id: r9863
 2003-08-25 20:18:44 +00:00
Max Horn
f91c575338 fixing off-by-one buglet (harmless in 99% of cases since the 'invalid' _imgBufOffs entries always contain the value of the last valid one) 
svn-id: r9862
 2003-08-25 20:05:02 +00:00
Max Horn
95b8558191 check for costume format, not engine version 
svn-id: r9860
 2003-08-25 14:54:32 +00:00
Max Horn
953e4216b8 implemented V1/C64 object masking, and simplified drawStripC64Mask a bit 
svn-id: r9859
 2003-08-25 14:27:29 +00:00
Travis Howell
285570f0d3 This fix should be v2 only 
Update comment

svn-id: r9858
 2003-08-25 14:17:34 +00:00
Max Horn
2257f8c0cd enable V1/C64 masking 
svn-id: r9857
 2003-08-25 13:15:59 +00:00
Max Horn
e40e6bb207 fixed and cleaned up V1 actor masking 
svn-id: r9856
 2003-08-25 13:13:43 +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
Max Horn
fcf04ecbfd commented my hack 
svn-id: r9851
 2003-08-24 17:38:20 +00:00
Max Horn
09368e09f2 fix for bug #786994 (DOTT: no custom cursor) 
svn-id: r9850
 2003-08-24 17:37:28 +00:00
Travis Howell
14e3dd96e0 Ooops, inventory still needs to be clear when moving through inventory. 
svn-id: r9840
 2003-08-24 02:27:52 +00:00
Travis Howell
4b6800fcf9 Minor cleanup 
svn-id: r9839
 2003-08-24 02:15:12 +00:00
Travis Howell
72bfe15f50 Update comment 
svn-id: r9838
 2003-08-24 02:11:14 +00:00
Travis Howell
79036c5a1d Handle hiding of verbs/inventory in v1-v2 games correctly. 
According to diasm. the verbs areas is only enabled and shown when (_userState & 128) is true and verbs/inventory area is cleared/redrawn on each state change.

svn-id: r9837
 2003-08-24 01:47:45 +00:00
Jamieson Christian
6768da3e76 Added comment keyword, per Fingolfin 
svn-id: r9831
 2003-08-23 16:30:32 +00:00
Travis Howell
6cc598250d Add comment 
svn-id: r9830
 2003-08-23 15:16:07 +00:00
Travis Howell
5e0f61a8b2 Typo 
svn-id: r9827
 2003-08-23 13:51:37 +00:00
Jamieson Christian
c6b5749f03 Added explicit 'ASFX' awareness for clarity 
svn-id: r9826
 2003-08-23 13:31:59 +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
Jonathan Gray
abf7f33dc4 loom towns needs this as well you can now learn f 
svn-id: r9814
 2003-08-22 03:14:29 +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
Jonathan Gray
485852ba6c change sound queue overflow error to warning as error was supposed to be temporarily apparently... 
svn-id: r9812
 2003-08-22 01:47:15 +00:00
Jamieson Christian
47c33674ec Fix for Bug [792178] MI1: Intro asynchronity regression 
Reverted Hoenicke's change. Why was this change made anyway?
Do not reinstate the "tempo tweak" before talking to me
about why it was needed.

svn-id: r9810
 2003-08-21 15:51:28 +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
Jonathan Gray
ce42f4d3dd patch #791738 g++ 3.4 compile fix, from Falk Hueffner and a few minor local bits in my tree 
svn-id: r9807
 2003-08-21 13:39:21 +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
Travis Howell
be0d723e7f Change Amiga palette option to Amiga version 
svn-id: r9800
 2003-08-20 14:01:39 +00:00
Travis Howell
fc005be4d9 Remove my junk 
svn-id: r9797
 2003-08-20 12:08:44 +00:00
Travis Howell
327d37ae78 v1 zak costume colors should be perfect now 
svn-id: r9796
 2003-08-20 12:04:25 +00:00
Travis Howell
cc781cb9b1 Ooops that would have broken v2 
svn-id: r9795
 2003-08-20 11:49:22 +00:00
Travis Howell
1757d5a448 v1 zak costume color almost all right. 
svn-id: r9794
 2003-08-20 11:45:40 +00:00
Travis Howell
e135f8a9b9 Leave masking disable for now, until it works well. 
svn-id: r9789
 2003-08-20 08:52:36 +00:00
Travis Howell
c284e1b507 This is only require for v1 maniac 
svn-id: r9781
 2003-08-19 11:11:11 +00:00
Paweł Kołodziejski
61c320d587 small changes to v1 mask 
svn-id: r9779
 2003-08-19 07:29:15 +00:00
Travis Howell
a34f8895cb Revert color change for v1 maniac, which actually used in pool room. 
svn-id: r9778
 2003-08-19 04:47:38 +00:00
Travis Howell
f25b54159c Remove fixme 
svn-id: r9777
 2003-08-19 04:36:46 +00:00
Travis Howell
7771433b20 Fix for v1 maniac demo mode not setting text color before displaying text 
svn-id: r9776
 2003-08-19 04:34:41 +00:00
Travis Howell
2dd4c40868 Fix cursor cycle color for v1 games 
svn-id: r9775
 2003-08-19 04:28:52 +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
Travis Howell
161ef54777 Correction for v1 zak faces 
svn-id: r9773
 2003-08-19 03:20:09 +00:00
Paweł Kołodziejski
91ab462ce5 ops 
svn-id: r9769
 2003-08-18 20:32:51 +00:00
Paweł Kołodziejski
fe94648dd6 fixed debug mode for mask maps 
svn-id: r9768
 2003-08-18 20:28:57 +00:00
Paweł Kołodziejski
8141126e6e fixed y position of mask in v1 costume rendering 
svn-id: r9767
 2003-08-18 17:59:06 +00:00
Paweł Kołodziejski
c9b0544625 some changes for smush codec 1 and 3, handled by bomp decompression 
svn-id: r9766
 2003-08-18 15:13:15 +00:00
Paweł Kołodziejski
487084e5ad fixed mask conversion for v1 games, still need properly handled 
svn-id: r9765
 2003-08-18 15:10:22 +00:00
Jamieson Christian
4748b92b33 Commented MI1 Demo fix. 
svn-id: r9764
 2003-08-18 13:55:12 +00:00
Chris Apers
d76b92d2b7 Make smush player works under PalmOS 
svn-id: r9763
 2003-08-18 12:53:26 +00:00
Travis Howell
d91320f7ce Remove debug 
svn-id: r9760
 2003-08-18 11:09:11 +00:00
Chris Apers
a47e80cb55 Updated globals access for PalmOS 
svn-id: r9759
 2003-08-18 10:59:21 +00:00
Travis Howell
9b5eb1137f Add support for flashlight in v1 maniac by converting older values. 
Prevent warning about dummy function (Which has no purpose) in zak

svn-id: r9756
 2003-08-18 10:46:42 +00:00
Travis Howell
311eb2678f Use correct costume color for darkness in v1 zak 
svn-id: r9752
 2003-08-18 06:59:18 +00:00
Paweł Kołodziejski
4bad55da8c fixed white spaces 
svn-id: r9751
 2003-08-18 06:29:39 +00:00
Paweł Kołodziejski
f29fbda7ac added dumping png frames from smush animation 
svn-id: r9750
 2003-08-18 06:11:37 +00:00
Jonathan Gray
c21fd14df8 change loomtowns target a tad 
svn-id: r9749
 2003-08-18 04:53:54 +00:00
Travis Howell
4c6bd7167d Fix v1 zak costume colors 
svn-id: r9748
 2003-08-18 02:16:48 +00:00
Jonathan Gray
99c677f2a3 add loom towns target 
svn-id: r9747
 2003-08-18 02:02:43 +00:00
Torbjörn Andersson
1bb575da9d Enabled the v1 costume palette tables Kirben and Hoenicke added earlier. 
svn-id: r9745
 2003-08-17 16:53:00 +00:00
Paweł Kołodziejski
711c2b76ce . 
svn-id: r9744
 2003-08-17 16:40:36 +00:00
Paweł Kołodziejski
bcb78c6ea0 some memory optimization 
svn-id: r9743
 2003-08-17 16:36:24 +00:00
Jochen Hoenicke
eb5f05fab3 More adlib tempo tweaks 
svn-id: r9742
 2003-08-17 16:32:36 +00:00
Paweł Kołodziejski
2269031b1f cleanup again 
svn-id: r9741
 2003-08-17 16:24:00 +00:00
Travis Howell
9b7773f4a2 Don't attempt sound in maniacnes 
svn-id: r9740
 2003-08-17 16:23:44 +00:00
Paweł Kołodziejski
41ca88939c forgot this 
svn-id: r9739
 2003-08-17 16:17:13 +00:00
Paweł Kołodziejski
970bdea9ac some cleanup in codec47 
svn-id: r9738
 2003-08-17 16:10:58 +00:00
Travis Howell
d343ef10b3 Remove c64_ignorePakCols calls for v1 games, since they cause crashes and don't seem to be required. 
Makes v1 maniac completable, maybe v1 zak too.

svn-id: r9736
 2003-08-17 12:13:17 +00:00
Travis Howell
be2e796247 OOps 
svn-id: r9735
 2003-08-17 08:00:26 +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
811f29fe79 Add palette tables for v1 costumes, thanks to Hoenicke 
Code isn't enabled yet though.

svn-id: r9733
 2003-08-17 05:46:48 +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
Jamieson Christian
61162bf359 Semantics correction 
svn-id: r9729
 2003-08-16 17:05:04 +00:00
Jamieson Christian
c67485254a Fixed hang in MI1 EGA Demo. Hang was the result 
of a conflict between two scripts trying to
putActorInRoom() on the same actor. One script
was trying to reset an actor which had already
been appropriated and set up by another script.

A warning is displayed when putActorInRoom()
is ignored, just in case this crops up in other
games and causes undesirable behavior. (I
tested with MI2 up until Woodtick, and didn't
encounter any places where the opcode had to
be ignored.)

svn-id: r9727
 2003-08-16 15:13:15 +00:00
Jochen Hoenicke
6db31f464f Some Tempo changes for adlib sounds 
svn-id: r9725
 2003-08-16 14:30:23 +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
Travis Howell
8cd96c7926 color table for actor subtitles in v1 maniac isn't static after all, fixes color issue in demo mode. 
svn-id: r9722
 2003-08-16 10:37:26 +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
Chris Apers
18bd921440 Fixed 
svn-id: r9718
 2003-08-16 09:12:26 +00:00
James Brown
5ad330e145 Patch from roarin_elk to fix crash in German V2 Zak (talking to Skolarian on Mars crashes) 
svn-id: r9717
 2003-08-16 08:55:29 +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
Jamieson Christian
4da3bf3a61 Fixed transpose/detune computations 
svn-id: r9715
 2003-08-16 06:17:27 +00:00
Travis Howell
2750eabcd5 Add a comment 
svn-id: r9714
 2003-08-16 06:01:10 +00:00
Travis Howell
5a963767bf Fix subtitles colors in V1 maniac 
svn-id: r9713
 2003-08-16 05:45:19 +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
Travis Howell
a892474a4f Fix my fix 
svn-id: r9711
 2003-08-15 15:17:25 +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
Travis Howell
7e611160a9 *** empty log message *** 
svn-id: r9707
 2003-08-15 14:18:09 +00:00
Jochen Hoenicke
f86a8cd38b implement the PCjr chunk 1 sounds. 
svn-id: r9706
 2003-08-15 13:58:54 +00:00
Jochen Hoenicke
185d563690 A different fix for Bugs item #788531. 
Allocate a 4th channel and map all accesses to out of bounds
channels to this channel.

svn-id: r9705
 2003-08-15 12:48:47 +00:00
Jochen Hoenicke
9c378d2f22 The imuse debugger commands now work with playerV2 too. 
svn-id: r9704
 2003-08-15 11:18:21 +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
Travis Howell
f9aea7673f Correct comment 
svn-id: r9702
 2003-08-15 10:07:31 +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
Jamieson Christian
c0730f6cb9 Fix for Bug [788531] Indy3VGA - Access violation with PC Speaker "travel" music 
Checked for OOB channel clear command. The "travel" music
in question seems to try to clear channel 4 when there are
only channels 0-3. Now we check and bail if OOB.

Perhaps this isn't quite the correct thing to do. Would
channel 4 be significant, as in perhaps "clear ALL channels"?
Hoenicke should answer this one.

svn-id: r9700
 2003-08-15 07:10:30 +00:00
Travis Howell
3ddb50711e Set v1 actor color to static for now, so actors can at least be seen easier. 
Change default colors so at least Dave's color look right.

svn-id: r9699
 2003-08-15 05:55:33 +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
f76980af39 Restrict monkeyega/vga music stop hack to ADL and RO sound resources 
svn-id: r9697
 2003-08-15 04:16:51 +00:00
Jonathan Gray
9d450bc9ce assert that string variable actually exists before we start doing comparisons against the string 
svn-id: r9696
 2003-08-15 03:15:41 +00:00
Jonathan Gray
78b6cb41a9 patch #788078 Improved Amiga V3 SFX support by Quietust 
svn-id: r9695
 2003-08-15 01:21:59 +00:00
Travis Howell
c258337b27 No need for those brackets 
svn-id: r9694
 2003-08-15 01:18:19 +00:00
Travis Howell
876383a9c9 Don't confuse RO and ROL sound resources 
svn-id: r9693
 2003-08-15 01:16:19 +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
Paweł Kołodziejski
5922f4c3d4 changed warning into debug in o8_startVideo func 
svn-id: r9691
 2003-08-14 17:17:11 +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
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
Jamieson Christian
a0c71ef5e9 Added music parser for special format of 
old-style MT-32 'RO' resources.

svn-id: r9683
 2003-08-14 08:24:13 +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
fa6d96086d Remove debug stuff that shouldn't have been commited 
svn-id: r9678
 2003-08-14 02:52:52 +00:00
Travis Howell
53eec92695 Add fixmes 
svn-id: r9677
 2003-08-14 02:32:40 +00:00
Travis Howell
90f77843ad v1 maniac sound player 
svn-id: r9676
 2003-08-14 02:30:54 +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
Bertrand Augereau
03524d071e Explicitly stated a bit masking to please VC.NET2003 runtime small types conversion checks. 
svn-id: r9674
 2003-08-13 23:07:05 +00:00
Bertrand Augereau
1a7bf49f34 Made Player::decode_sysex_bytes const-correct. 
Explicitly stated a bit masking to please VC.NET2003 runtime small types conversion checks.

svn-id: r9673
 2003-08-13 22:45:22 +00:00
Bertrand Augereau
830d1b702a Made Player::decode_sysex_bytes const-correct. 
svn-id: r9672
 2003-08-13 22:43:08 +00:00
Bertrand Augereau
93ca5cb3af Explicitly stated a bit masking to please VC.NET2003 runtime small types conversion checks. 
svn-id: r9671
 2003-08-13 22:40:57 +00:00
Bertrand Augereau
0563d61106 Explicitly stated a bit masking to please VC.NET2003 runtime small types conversion checks. 
svn-id: r9670
 2003-08-13 22:26:31 +00:00
Jamieson Christian
d38a028996 More monkeyvga credits fix for -epcspk/pcjr 
svn-id: r9666
 2003-08-13 17:38:05 +00:00
Jamieson Christian
2ad09e7857 Fix monkeyvga hang when using -epcspk/pcjr 
svn-id: r9665
 2003-08-13 17:18:31 +00:00
Torbjörn Andersson
2973317f1d Fix for bug #787841 ("SAM: Crash when using retriever on Max"). For 
whatever reason, o6_walkActorToObj() was trying to find the coordinates for
an object that was marked as being in the inventory.

svn-id: r9664
 2003-08-13 16:38:02 +00:00
James Brown
5dd554c47a Add 'name' lookup ability to debuggers "actor" and "object" commands 
svn-id: r9663
 2003-08-13 16:24:35 +00:00
Travis Howell
eba32fbd0c Add fixme comment 
svn-id: r9662
 2003-08-13 16:21:35 +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
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
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
Jochen Hoenicke
fef62655f8 Fixed the freqency of one note. This bug is also in the original Lucas 
Arts Games...

svn-id: r9648
 2003-08-12 15:40:24 +00:00
Jamieson Christian
442c79671a Removed unused stuff. 
svn-id: r9647
 2003-08-12 07:32:43 +00:00
Jamieson Christian
6e51f394e8 Added GM-to-MT32 program mapping. Allows 
GM-only SCUMM games like Sam & Max to
play properly on an MT-32.

svn-id: r9646
 2003-08-12 06:58:11 +00:00
Jonathan Gray
b1f2e66e30 this makes more sense in hex 
svn-id: r9645
 2003-08-12 05:28:11 +00:00
Jonathan Gray
aefdffbd2d mention what format a costume is using (ie why it is invalid) 
svn-id: r9644
 2003-08-12 04:53:35 +00:00
Jamieson Christian
a52b44f3fe Expanded iMuse debugger commands. All iMuse 
commands are now under "imuse", and underscores
have been removed.

imuse panic - Stop all music tracks
imuse multimidi on/off - Set multimidi
imuse play # - Play a sound resource
imuse play random - Play a random sound resource
imuse stop # - Stop a music resource
imuse stop all - Stop all music resources

Note that "play #" and "play random" only attempt
to play a sound resource. If the resource is not
a music resource or is in a format not supported by
the current music driver, it won't play.

You can use this as a mini jukebox, but be sure
you're in a room with minimal activity. The
goal is to minimize interference from the scripts
while playing sounds that are not expected in
that room.

svn-id: r9641
 2003-08-11 14:48:21 +00:00
Travis Howell
82328fa050 Ooops that should only be for Amiga scumm 5 games. 
svn-id: r9637
 2003-08-11 06:24:19 +00:00
Jamieson Christian
50ce07c391 Fix for Bug [770364] MI2: Amiga - Segfault when entering bar 
Possible fix for Bug [770085] MI2: Amiga version always crashes after a few minutes

Corrected OOB graphics writes in proc3_ami() by fixing the
mask to properly detect negative Y values. Don't know if
this is the right way to fix this -- there are enough GFX
bugs in the Amiga code as to make assessment difficult --
but at least it averts crashes.

svn-id: r9634
 2003-08-11 03:52:34 +00:00
Travis Howell
0e831751bc Fix a regression, this code is required for Amiga versions! 
Fixes some brief costume distortions

svn-id: r9633
 2003-08-11 03:45:12 +00:00
Jonathan Gray
957185a62e this fixme doesn't apply to old bundle games using GID_INDY3 target 
svn-id: r9631
 2003-08-11 02:31:03 +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
117b7d0061 Fix regression 
svn-id: r9629
 2003-08-11 00:48:32 +00:00
Marcus Comstedt
2ed0eee711 Replaced use of File with use of SaveFileManager where appropriate. 
svn-id: r9627
 2003-08-10 20:50:50 +00:00
Marcus Comstedt
a5aa5c0d73 Harmonized SaveFile API with File API a bit. 
svn-id: r9626
 2003-08-10 20:49:13 +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
Jamieson Christian
550bf93656 Added imuse_panic to turn off all music players 
svn-id: r9621
 2003-08-10 11:39:17 +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
Jonathan Gray
101821015c remove debug printf 
svn-id: r9598
 2003-08-08 09:26:09 +00:00
Jamieson Christian
8281d8ad42 Fixed type mismatch warning 
svn-id: r9594
 2003-08-08 07:45:41 +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
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
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
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
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
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
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
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
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
05eb891492 another tab completion fix by wjp 
svn-id: r9517
 2003-08-05 19:43:04 +00:00
Max Horn
e738b64bb1 fix for debugger tab completion (thanks wjp) 
svn-id: r9515
 2003-08-05 19:23:26 +00:00
Max Horn
995ec987d0 fix warning, cleanup code 
svn-id: r9511
 2003-08-05 17:58:38 +00:00
Max Horn
4ae47a74bf added support for output sample rates > 32767 (still limited to a max of 65535, but all we care about are 44100 and 48000 anyway) 
svn-id: r9510
 2003-08-05 17:52:47 +00:00
Max Horn
59bd4cb493 cleanup 
svn-id: r9509
 2003-08-05 17:50:06 +00:00
James Brown
386b8216df Make prepositions work 
svn-id: r9505
 2003-08-05 16:57:47 +00:00
Max Horn
10508d4d2b fix warning / whitespace 
svn-id: r9504
 2003-08-05 16:51:40 +00:00
James Brown
7cbb06c4a6 Forgot some V1 prep code 
svn-id: r9503
 2003-08-05 16:48:56 +00:00
James Brown
173e3c5db3 V1 preposition support, but broken. 
svn-id: r9502
 2003-08-05 16:43:33 +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
Max Horn
87ea0f9195 removed obsolete FIXME 
svn-id: r9488
 2003-08-05 12:25:24 +00:00
Max Horn
c120fecf04 fixed VAR_TALKSTOP_KEY for V7 games (descumm6.cpp had it right all the time :-) 
svn-id: r9486
 2003-08-05 12:23:26 +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
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
f18627bfd5 fix warning 
svn-id: r9443
 2003-08-03 18:34:46 +00:00
Max Horn
79a4972698 removed obsolete warning 
svn-id: r9442
 2003-08-03 18:26:46 +00:00
Max Horn
ffa32a2eca o5_getStringWidth was missing getResultPos() (thanks to _Q for pointing this out) 
svn-id: r9441
 2003-08-03 18:23:54 +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
Max Horn
7c2713f57a indention fix (so the code adheres to our indention rules) 
svn-id: r9384
 2003-08-01 20:39:16 +00:00
Max Horn
4a2a1fcdd0 enable partial looping: However this is *completely* untested since I have no clue where this feature is used, so i can't test it... if somebody tells me where this occurs, I can fix it, if it's not working already 
svn-id: r9361
 2003-08-01 12:50:19 +00:00
Max Horn
0df319e952 #include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level) 
svn-id: r9359
 2003-08-01 12:21:04 +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
0b4e48b59e revamped MP3/Vorbis CD 'emulation' code to use a PlayingSoundHandle -> this allows to finally get rid of the hackish isChannelActive/isChannelUsed methods in SoundMixer 
svn-id: r9346
 2003-07-31 20:24:10 +00:00
Max Horn
1bcdcffc7d spelling (bug #781028) 
svn-id: r9342
 2003-07-31 18:55:29 +00:00
Max Horn
c3c39a33c3 cleanup for some comments & indention 
svn-id: r9341
 2003-07-31 18:46:31 +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
James Brown
636b8458b3 Forward-port ZakV2 hacks from 0.5.0 branch 
svn-id: r9332
 2003-07-31 15:32:57 +00:00
Jamieson Christian
7c16006cc7 Fix for RC bug [780675] MI2: Reoccuring crash 
Tightened up OOB track selection handling in
MidiParser. Apparently some SMFs in the Mac
version of MI2 (and other games?) specify
track -1 in their jump commands to indicate
a jump within the same track.

svn-id: r9321
 2003-07-31 06:50:13 +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
Max Horn
6b470390f7 cleanup 
svn-id: r9281
 2003-07-29 12:39:41 +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
c62b74a08f Added FIXME 
svn-id: r9265
 2003-07-29 00:05:19 +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
Torbjörn Andersson
e0ee9d3688 Fix for bug #778060 ("DOTT: Subtitle drawing glitch"). 
svn-id: r9249
 2003-07-28 15:47:46 +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
Max Horn
12d872f754 more sanity checks 
svn-id: r9208
 2003-07-28 01:09:54 +00:00
Max Horn
64e0a16a6d adding an assert (better paranoid than letting a null pointer slip thru) 
svn-id: r9207
 2003-07-28 00:33:05 +00:00
Max Horn
0d209fecb6 fix return values in getObjectOrActorXY; turned unsafe derefActorSafe call into derefActor (return value of derefActorSafe was used w/o checking it for 0) 
svn-id: r9206
 2003-07-28 00:04:20 +00:00
Max Horn
ff988094be init walkdata (fix for bug #770306); move Actor::Actor constructor from header to source file 
svn-id: r9205
 2003-07-27 23:45:43 +00:00
Max Horn
77c8eec439 oops this was never meant to be removed 
svn-id: r9203
 2003-07-27 23:30:28 +00:00
Max Horn
7e54a2f569 fix inventory scrolling V1/V2 games (there were problems with an odd inventory count) 
svn-id: r9201
 2003-07-27 17:33:28 +00:00
Paweł Kołodziejski
80cbf90a9d some cleanup 
svn-id: r9198
 2003-07-27 12:25:56 +00:00
Max Horn
ce29c4c295 fixed setActorCostume for COMI; fixees bug #754421 and hopefully also the issue described in patch #696033 
svn-id: r9191
 2003-07-25 18:07:42 +00:00
Max Horn
791efd853a lots of mixer changes: replaced _volumeTable by _globalVolume (applying volume after resampling is more accurate); made more member vars of SoundMixer protected (and thus added some new getter methods); added (untested) support for a second (stereo) channel when playing MP3 
svn-id: r9184
 2003-07-25 01:19:14 +00:00
Max Horn
b15277e5ed oops, wanted to move talkFrequency initialisation, but only re-moved it, and didn't add it in its new place. bad me! 
svn-id: r9182
 2003-07-24 23:33:43 +00:00
Max Horn
becd70d243 cleanup: encapsulate some more members of class Actor, and rename newDirection -> targetFacing (since it corresponds to the future value of 'facing'; the distinction between 'facing' and 'direction' is extremly fuzzy) 
svn-id: r9175
 2003-07-24 17:44:00 +00:00
Torbjörn Andersson
9db2d93614 Slight cleanup of previous commit. 
svn-id: r9147
 2003-07-23 14:36:18 +00:00
Torbjörn Andersson
e66bdf91b9 Allow the sentence line to be 40 printable characters long. The verb part 
is padded with '@', which should not be counted.

svn-id: r9146
 2003-07-23 14:33:57 +00:00
Travis Howell
2b0e1b7000 Small correction for mac loom 
svn-id: r9143
 2003-07-23 05:36:08 +00:00
Travis Howell
fc5080bfb2 Ooops that should not have been commmited 
svn-id: r9142
 2003-07-23 05:18:47 +00:00
Travis Howell
13dae9b394 fm towns cd audio fix from Hibernatus 
svn-id: r9141
 2003-07-23 05:17:21 +00:00
Max Horn
b43125cd36 fix for bug #775839; unified the various Indy3 checks (this gets annoying, maybe we can merge the three GIDs after 0.5.0; any difference could be handled via _feature flags (e.g. added a GF_TOWNS flag) 
svn-id: r9137
 2003-07-22 22:33:34 +00:00
Max Horn
2becb78d86 fix for bug #762593 (ZAK256: Audio CD not handled properly) 
svn-id: r9135
 2003-07-22 22:14:14 +00:00
Torbjörn Andersson
3b033956aa Changed "SCALLING" to "SCALING". 
svn-id: r9134
 2003-07-22 20:53:01 +00:00
Max Horn
9bd7cdbce0 so it's not the endFrame, but the duration (in frames), after all! grmbl, took me long enough to figure this out, now I can fix up system.h, and then decide whom I can blame for this mess (yeah I know I renamed everything to endFrame in here, but it was named incorrectly in many other places already... ah well, at least now we know :-) 
svn-id: r9130
 2003-07-22 20:27:54 +00:00
Max Horn
dce17ed7ac fix for bug #775420; also properly implemented the 'box matrix truncated' workaround 
svn-id: r9129
 2003-07-22 19:01:38 +00:00
Max Horn
655759a70d fix for bug #775640 
svn-id: r9128
 2003-07-22 16:34:52 +00:00
Max Horn
bda0a18eee made about dialog global (so that it can be used from the launcher and from sky/simon; also added our copyright to it 
svn-id: r9122
 2003-07-22 16:05:51 +00:00
Max Horn
a62e49d0d4 added a FIXME 
svn-id: r9121
 2003-07-22 16:05:40 +00:00
Max Horn
2cee32864a fix spanish prepositions, see bug #772277. And BTW, does anybody know when and where the 'on/mit/sur/su/en' preposition is actually used? 
svn-id: r9116
 2003-07-22 01:14:09 +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
9b02cb4cce fixing bug #774783 for the VGA version, too - and I bet the FmTowns version will need this fix, too 
svn-id: r9112
 2003-07-21 22:11:33 +00:00
Max Horn
743ad2aaa6 really fix #774783 in IndyEGA (while the value '1' is not strictly correct, and in IndyVGA it is 0, and 0 is the logical value - this *has* to be 1 (and 1 is what the original returns, too, due to a bug) 
svn-id: r9111
 2003-07-21 22:08:39 +00:00