Commit Graph

2403 Commits

Author SHA1 Message Date
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