Commit graph

148 commits

Author SHA1 Message Date
Matthew Hoops
a83ce70467 SCI: Silence a gcc conversion warning 2014-06-01 17:28:34 -04:00
Johannes Schickel
8fc7d60feb SCI: Make GPL headers consistent in themselves. 2014-02-18 02:39:37 +01:00
Willem Jan Palenstijn
8cc82d0a0b SCI: Make fade signal version check more precise 2013-11-23 16:11:07 +01:00
Willem Jan Palenstijn
35617bf601 SCI: Fix SCI1late fade complete signal
This fixes duplicate music playing in LauraBow2CD (#6462)
2013-11-23 15:27:16 +01:00
m-kiewitz
158d12e555 SCI: abbrev. ffs to FE and priority check fix 2013-09-21 14:34:42 +02:00
m-kiewitz
4443793b97 SCI: sfx/music priority int16 fixes bug #3615038
it seems that sound system up till SCI0_LATE uses int16, afterwards it seems they changed to byte
main music object (conMusic) in Laura Bow 1 uses -1 as priority. This was truncated to 255 till now, which resulted in many sound effects not getting played, because those used priority 0
2013-09-21 14:27:16 +02:00
Filippos Karapetis
125b146b06 SCI: Implement the 4-param version of kDoSoundSendMidi - bug #3614447
Many thanks to wjp for his help with disassembly
2013-06-19 02:08:06 +03:00
Willem Jan Palenstijn
6e3510ac61 SCI: Add note about LSL1vga DoSoundSendMidi 2013-06-18 18:46:54 +02:00
Filippos Karapetis
d0697addab SCI: Change wording for a function reference 2013-04-28 23:31:11 +03:00
Filippos Karapetis
46ebf37ec9 SCI: Change wording for bug/further info references 2013-04-27 14:04:27 +03:00
Willem Jan Palenstijn
e273a387a7 SCI: Replace workaround for bug #3605269 by script patch 2013-04-19 23:50:04 +02:00
Willem Jan Palenstijn
cdf1900ce0 SCI: Add signal/fade related CHECKME 2013-04-07 18:22:41 +02:00
Willem Jan Palenstijn
6f3c83bd51 SCI: Minor cleanup
(Thanks waltervn)
2013-04-06 22:28:42 +02:00
Willem Jan Palenstijn
1e1cc7309f SCI: Further clarify comment 2013-04-06 22:11:15 +02:00
Willem Jan Palenstijn
173a022f91 SCI: Clarify comment 2013-04-06 20:48:52 +02:00
Willem Jan Palenstijn
d0d9894b22 SCI: Revert "Fixed fading-related bugs #3267956 and #3041738"
This reverts commit bfef0f5a6f.
2013-04-06 20:46:15 +02:00
Willem Jan Palenstijn
6f3716ae74 SCI: Re-initialize more of MusicEntry on play
This fixes bug #3267956.
2013-04-06 20:31:34 +02:00
Willem Jan Palenstijn
eb48325248 SCI: Revert "Added a more specific workaround for bug #3267956.[...]"
This reverts commit 5654e12575.

Conflicts:
	engines/sci/sound/soundcmd.cpp
2013-04-06 20:31:34 +02:00
Willem Jan Palenstijn
da3583f569 SCI: Revert "Clarify comment from rev 5654e12 further"
This reverts commit 9f74a6eda2.
2013-04-06 20:31:34 +02:00
Willem Jan Palenstijn
5a2ef39335 SCI: Revert "Fix script bug #3555404 - "SCI: KQ6 Spider Scene Game Freeze""
This reverts commit 8524ebd699.
2013-04-06 20:31:34 +02:00
Willem Jan Palenstijn
9155e8e1a1 SCI: Revert "Properly fix bugs #3267956 and #3605377"
This reverts commit 17ca8d14b1,
except for a minor unrelated change to the workaround for bug #3605269

Conflicts:
	engines/sci/sound/soundcmd.cpp
2013-04-06 20:31:34 +02:00
Willem Jan Palenstijn
0f2fae14cc SCI: Revert "Add a hack to fix bug #3596335"
This reverts commit f019d5a488.
2013-04-06 20:31:34 +02:00
Willem Jan Palenstijn
841b6ca540 SCI: Revert "Add a more generic solution for the problem found in bug #3605269"
This reverts commit c6320a28e4.
SSCI does not interpret signals on other channels than 15.

Conflicts:
	engines/sci/sound/soundcmd.cpp
2013-04-05 21:14:55 +02:00
Filippos Karapetis
f019d5a488 SCI: Add a hack to fix bug #3596335
Game scripts are waiting indefinitely for a song, thus we change its dataInc
selector to prevent that from happening
2013-04-04 00:37:43 +03:00
Filippos Karapetis
17ca8d14b1 Properly fix bugs #3267956 and #3605377
SCI: Only stop after fading, if the song to be faded is faded down. Also,
reset the song signal when fading starts. It was set to -1 when fading
started in bug #3267956, thus it stopped immediately.
2013-04-04 00:37:43 +03:00
Filippos Karapetis
c6320a28e4 SCI: Add a more generic solution for the problem found in bug #3605269
We now accept signals from all channels if channel 15 is missing. This
is a very rare edge case, but our behavior is now somewhat closer to what
the original interpreter seems to be doing. Mordack's appearance animation
is now synced properly. The more generic workaround works for songs 1840
and 1843, but not for 1849, which is still problematic and we still resort
to manually changing its dataInc selector
2013-04-02 10:03:48 +03:00
Filippos Karapetis
dc2d8793b9 SCI: Set the song's sound queue signal to -1 when stopping a sound, like SSCI does
Previously, we set the signal of the sound objects themselves to -1, but set the
sound queue's signal to 0. This now matches the original behavior.
2013-04-01 21:31:50 +03:00
Filippos Karapetis
2e93ee2b83 SCI: Fix bug #3605269 - "SCI: KQ5 Windows CD - Game Hangs Before Final Battle"
This is caused because songs 1840, 1843 and 1849 are all missing their special
SCI signaling channel (channel 15), so the game scripts wait indefinitely for
signals which are never set
2013-04-01 21:31:50 +03:00
Filippos Karapetis
d54a57ccee SCI: Stop and clear sounds that have no data. Fixes an issue in KQ6 Mac
Thanks to waltervn and clone2727 for the original patch. Tested LSL5
with this change, and the problematic sound in the mud wrestling scene
is handled correctly
2013-03-29 01:25:35 +02:00
Willem Jan Palenstijn
e37be9f535 SCI: Use correct priority selector in SoundCmd
It was using 'pri' instead of 'priority', apparently due to a
selector number->name translation error from 544daa5c31.

Thanks to waltervn for spotting this.
2013-01-29 20:55:40 +01:00
Filippos Karapetis
1286710248 SCI: Fix bug #3578335 - "SCI: Mixed-Up Mother Goose EGA - crash upon choosing kid"
In several SCI0 games, the parameter to kDoSoundFade can be null.
We handle that case, instead of adding individual workarounds per game
2012-10-22 12:47:28 +03:00
Filippos Karapetis
b19ccb9d1e SCI: Set the correct audio type for SCI1.1 sound effects, fixing bug #3554709
Now, sound effects in SCI1.1 games will no longer be incorrectly using the speech
sound volume. This avoids them being silenced in floppy games that are flagged
as not having speech. Fixes bug #3554709 - "SCI: Digital SFX don't play when
Override Global Audio set"
2012-08-20 03:22:56 +03:00
Filippos Karapetis
8524ebd699 SCI: Fix script bug #3555404 - "SCI: KQ6 Spider Scene Game Freeze" 2012-08-20 02:58:37 +03:00
Filippos Karapetis
152b340a9a SCI: Remove a music fading hack used for the intro of Longbow 2012-06-26 13:22:05 +03:00
Filippos Karapetis
2b50824133 SCI: Add setter/getter methods to reg_t's
No functionality change has been made with this commit. This avoids
setting and getting the reg_t members directly, and is the basis of any
future work on large SCI3 scripts (larger than 64KB)
2012-06-18 05:24:06 +03:00
Filippos Karapetis
6a49d3eadd ENGINES: Return all available custom GUI options if no target is specified
This is used to set default settings for all custom game options when an
engine starts
2012-03-31 13:55:03 +03:00
Filippos Karapetis
536a7e407f SCI: Hook up the digital SFX and CD audio options
The relevant code wasn't added in the newer commits - this was an
oversight from my part
2012-03-25 16:40:49 +03:00
Matthew Hoops
865c54c125 SCI: Fix GK1 demo sounds
This is a regression from 9fd66deb43 and, despite the commit message, was *not* fixed by 1736345906
2012-03-05 12:22:13 -05:00
Filippos Karapetis
3752396aef SCI: Always prefer digital sound effects to prevent confusion to users
This toggle will be enabled again when a more user-friendly GUI option
is possible
2011-12-28 13:21:19 +02:00
Filippos Karapetis
8496b5c4d8 SCI: Rename _bMultiMidi to _useDigitalSFX and only initialize it inside SoundCommandParser 2011-12-28 13:14:55 +02:00
Filippos Karapetis
1736345906 SCI: The demo of GK1 has no alternate sound effects.
This fixes the sound effect heard in the "Day 1" screen
2011-10-20 19:02:15 +03:00
Filippos Karapetis
e7260d992c SCI: Updated a comment inside processPlaySound() 2011-10-13 14:03:57 +03:00
Filippos Karapetis
0166665926 SCI: Fixed a long-standing bug in kDoSound(init)
The sound handle should not be set in kDoSound(init), but in
kDoSound(play). This is verified against several SCI versions,
plus game scripts check if a sound slot is playing primarily
by checking its handle. Fixes the sound in Shivers and probably
an assortment of other sound related bugs
2011-10-12 12:49:39 +03:00
Filippos Karapetis
4e1face890 SCI: Mixed Adlib/MIDI mode for audio resources should always be enabled in SCI32 2011-10-10 12:20:52 +03:00
Filippos Karapetis
b17d424257 SCI: Fixed menu music in GK1 when multi MIDI is disabled
A regression from commit 9fd66de
2011-10-10 01:41:09 +03:00
Filippos Karapetis
9fd66deb43 SCI: Changes to the sound resource initialization code
- Unified the sound resource initialization code in
processInitSound() and reconstructPlayList()
- Now checking the "Mixed Adlib/MIDI" mode checkbox for SCI1.1 digital
audio sound effects, like it's done for SCI0 - SCI1 sound effects. If
it's unchecked, their MIDI counterparts will play instead, if
available
2011-09-26 20:02:34 +03:00
Filippos Karapetis
e552bc57ba SCI: Always reset hold when starting a new song. Fixes bug #3413589 - "SCI: KQ6CD: Game stops responding in the catacombs"
kDoSoundSetHold is always called after kDoSoundPlay. A regression from
commit 4f3b85f4ef
2011-09-24 18:46:55 +03:00
Filippos Karapetis
077acc5575 SCI: Fixed bug #3413301 - "SCI: KQ6CD: Game stops responding at the bookworm" 2011-09-23 17:42:14 +03:00
Filippos Karapetis
996deff15b SCI: Fixed bug #3392767 - "SCI: SQ4 (English/CD/Win): Engine Abort In Timepod Hangar"
This bug only manifested in the Windows version of SQ4CD. Some Windows
MIDI music tracks are missing from room 530, which messed up the
animations in that scene, and led to a crash. Moved the code that
obtains the song number from an object into a separate function. Also,
fixed a bug in kDoSoundSetPriority().
2011-08-25 02:52:58 +03:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00