Commit graph

64 commits

Author SHA1 Message Date
Martin Kiewitz
38d79f60e3 SCI: changing signature for kDoSound(resume) it seems its called right after restoring to resume music - which we do already automatically
svn-id: r50800
2010-07-11 11:52:17 +00:00
Martin Kiewitz
ce6a73adf5 SCI: updated debug output from kDoSound
svn-id: r50781
2010-07-10 13:19:20 +00:00
Martin Kiewitz
18d1ab8c70 SCI: move comments and change selector for sci0 sound in kDoSoundPause, also allow pausing everything even for sci1early (qfg2 is using it)
svn-id: r50765
2010-07-09 18:11:42 +00:00
Martin Kiewitz
eddd6d0dba SCI: actually all sound-sci0 games used a completely different kDoSoundPause logic, implement it - fixes all sorts of games not pausing when going to restore menu and more
svn-id: r50760
2010-07-09 16:05:47 +00:00
Martin Kiewitz
aadf2e9765 SCI: added currently commented-out pauseSound implementation for some sci0 games, allowing integer for that subfunction
svn-id: r50759
2010-07-09 14:11:27 +00:00
Martin Kiewitz
b8933d7e8f SCI: removing unneeded mutex locking inside sci0 update cues
svn-id: r50758
2010-07-09 13:01:48 +00:00
Martin Kiewitz
b602e7071b SCI: fixing regression of r50755 - fixing kDoSoundSendMidi
svn-id: r50757
2010-07-09 12:30:34 +00:00
Martin Kiewitz
ba776fb293 SCI: implemented subsignatures for kDoSound
svn-id: r50755
2010-07-09 12:06:41 +00:00
Filippos Karapetis
bff3e89e48 SCI: Removed the FreeSCI music code
svn-id: r50532
2010-06-30 13:49:05 +00:00
Max Horn
b09996cb5c SCI: Rewrap yet more comments
svn-id: r50505
2010-06-29 20:50:52 +00:00
Filippos Karapetis
59c908e97d Changed a warning which seems like regular SCI behavior into a debugC
svn-id: r50218
2010-06-24 13:44:27 +00:00
Filippos Karapetis
0a102981f0 Moved the SelectorCache struct inside selector.h, where it belongs, and fixed some header dependencies in the process
svn-id: r50183
2010-06-23 15:23:37 +00:00
Filippos Karapetis
ac4659b92a Added several unimplemented kDisplay subops, as well as a new sound command, found in the demo of Longbow
svn-id: r49983
2010-06-18 01:11:00 +00:00
Filippos Karapetis
9c1ec81d76 Strict mode: Turned several severe errors (almost all detection related) into errors, instead of warnings
svn-id: r49972
2010-06-17 23:45:38 +00:00
Martin Kiewitz
423029c027 SCI: implemented channel muting for sci1, finally fixes lsl5 paino scene with patti
svn-id: r49926
2010-06-17 11:54:54 +00:00
Martin Kiewitz
3a8e11767d SCI: decreasing channel given to us on cmdSendMidi by one, so mute command now matches the right channel. sierra sci also decreased by one (their channel is 1-based)
svn-id: r49924
2010-06-17 11:05:39 +00:00
Filippos Karapetis
e93f8902a8 Cleanup of the savegame code:
- Added a saveLoadWithSerializer() method to the reg_t class
- Moved SegManager::reconstructClones() inside savegame.cpp
- Moved SoundCommandParser::syncPlayList() and SoundCommandParser::reconstructPlayList() inside savegame.cpp

svn-id: r49683
2010-06-15 07:20:53 +00:00
Filippos Karapetis
f4739f9f68 Added debug output to kDoAudio and some music commands. Also added a warning when an audio stream can't be created. Finally, the debug level of the MIDI parser debug output has been raised to 4, as it's too verbose
svn-id: r49605
2010-06-12 11:41:22 +00:00
Filippos Karapetis
eb4ec596cd Use the SELECTOR() macro for readability
svn-id: r49563
2010-06-10 09:18:57 +00:00
Martin Kiewitz
f743468ec7 SCI: if song isn't playing, set signal and don't set fadeout/fadein variables - fixes lsl3 music lost after entering/exiting tv room (bug #3007406)
svn-id: r49500
2010-06-08 09:36:27 +00:00
Filippos Karapetis
1fd3877ec7 Cleanup
svn-id: r49333
2010-05-30 20:18:42 +00:00
Filippos Karapetis
67de5b1bd3 Mass renaming of selector-related functions, and removed some defines which were just cloaking functions with a different name
- GET_SEL32 -> readSelector
- GET_SEL32V -> readSelectorValue
- PUT_SEL32 -> writeSelector
- PUT_SEL32V -> writeSelectorValue
Also, changed some selector-related function names and variables to CamelCase

svn-id: r49317
2010-05-29 23:37:15 +00:00
Martin Kiewitz
dad3ad86ea SCI: read out vol selector on initSound/playSound for sci1early (soundversion) as well - fixes lsl1demo
svn-id: r49285
2010-05-28 09:29:05 +00:00
Martin Kiewitz
cfed70df07 SCI: fixing resuming samples - fixes hang when ship is flying away happening when you entered menu during that sequence
svn-id: r49261
2010-05-27 11:26:37 +00:00
Martin Kiewitz
b069b9fe96 SCI: reenabling "stopAllSounds" code disabled in r49101 - isn't called anymore since priority is honored so it may have been right after all
svn-id: r49158
2010-05-23 16:42:49 +00:00
Martin Kiewitz
d27e32aa19 SCI: fix regression of r49156 - if multiple songs are stored for resume-play, use the last one - fixes iceman wrong music played after going through door in room 14 - still not sure about this, added fixme
svn-id: r49157
2010-05-23 13:22:58 +00:00
Martin Kiewitz
264fde962b SCI: sound code now queues up music in sci0, wip-code: not reacting on priority yet - fixes iceman room 14
svn-id: r49109
2010-05-19 21:10:43 +00:00
Martin Kiewitz
e243c87fc0 SCI: updated comment on kDoSound(12)
svn-id: r49108
2010-05-19 19:41:10 +00:00
Martin Kiewitz
3f10841ae8 SCI: removed cmdStopAllSounds(), can't be right - added FIXME - fixes iceman room 14 music stopping within 1-2 seconds
svn-id: r49101
2010-05-19 14:54:39 +00:00
Martin Kiewitz
9b4f352870 SCI: cleanup soundcode - number renamed to resourceId, prio renamed to priority
svn-id: r49098
2010-05-19 14:19:16 +00:00
Martin Kiewitz
e41874c91d SCI: set signal on fadeOut and also set signal when fade is requested but sound is not playing (& show warning in that case) - fixes iceman hang after fireworks in room 14
svn-id: r49087
2010-05-18 19:59:43 +00:00
Martin Kiewitz
a5ed930340 SCI: remove unneeded _mutex lock to fix deadlock issue
svn-id: r49006
2010-05-11 16:15:21 +00:00
Martin Kiewitz
a31de2adfa SCI: set signal to SIGNAL_OFFSET, when a music slot is played that doesn't contain supported data - fixes lsl5 mud wrestling "regression" in new music/sound code (worked before with old music/sound engine)
svn-id: r49000
2010-05-10 20:32:55 +00:00
Martin Kiewitz
b07a88548f SCI: set signal in SCI0/SCI01 games, when samples have been played only. fixes sq3 guys from andromeda, but also doesn't screw up music in sq3new/kq1 - added comments about this issue
svn-id: r48918
2010-05-03 17:54:47 +00:00
Martin Kiewitz
c67344d380 SCI: reverting r48805 - caused regression in sq3new/kq1
svn-id: r48915
2010-05-03 16:47:09 +00:00
Martin Kiewitz
3f601f15bf SCI: changing comment slightly about setting signal selector in stopSound for SCI0
svn-id: r48806
2010-04-26 14:13:38 +00:00
Martin Kiewitz
98ae0f8218 SCI: also set signal selector when stopping sounds for SCI0 as well - fixes sq3 freeing 2 guys from andromeda endless loop
svn-id: r48805
2010-04-26 14:11:30 +00:00
Max Horn
975dbef0e5 SCI: Remove sound/audio.h include from engine/state.h
svn-id: r48063
2010-02-15 00:20:53 +00:00
Max Horn
06021f79ac SCI: Fix compiling with USE_OLD_MUSIC_FUNCTIONS enabled
svn-id: r48051
2010-02-13 17:46:05 +00:00
Max Horn
ac4d325e0d SCI: Add global g_sci pointer to the active SciEngine instance
svn-id: r48046
2010-02-13 17:42:49 +00:00
Max Horn
f86618f92b SCI: Add a 'SELECTOR' macro
svn-id: r47918
2010-02-05 22:55:18 +00:00
Willem Jan Palenstijn
06bd17ee71 SCI: Remove extra '\n's in debugC messages
svn-id: r47707
2010-01-30 11:59:05 +00:00
Filippos Karapetis
85517515a7 Reverting incorrect rev. 47675. The actual problem was that SCI0 doesn't clear a song's handle when stopping it, but when disposing it. Hopefully, a lot of the SCI0 sound oddities are fixed now...
svn-id: r47678
2010-01-29 19:02:13 +00:00
Filippos Karapetis
ddda7d12bd Wording
svn-id: r47676
2010-01-29 17:47:17 +00:00
Filippos Karapetis
be293572d2 Don't modify the objects of sound slots that are already stopped, as the associated objects could have been disposed. Fixes odd crashes in SQ3
svn-id: r47675
2010-01-29 17:45:30 +00:00
Max Horn
4ffec28103 SCI: Move selector stuff to new header; reorder k_argc & k_argp param of invoke_selector
svn-id: r47665
2010-01-29 11:03:54 +00:00
Filippos Karapetis
76ff84a62f Fixed the demo version of Longbow - speech was not played at all with the new sound code
svn-id: r47610
2010-01-27 21:11:24 +00:00
Filippos Karapetis
46a05ce332 Fixed loading of old saved games
svn-id: r47576
2010-01-26 22:04:33 +00:00
Walter van Niftrik
9861b04b93 SCI: Add driver for Yamaha FB-01. Cleanup.
svn-id: r47571
2010-01-26 19:25:33 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00