Commit Graph

94 Commits

Author SHA1 Message Date
Johannes Schickel
95d11e6e37 - Add new method "isVoicePresent" to "Sound".
- Change LoL character selection to use it.
- Allow quitting ScummVM in LoL character selection.

svn-id: r41008
2009-05-29 17:12:45 +00:00
Johannes Schickel
c0302661ed Cleanup.
svn-id: r40850
2009-05-24 01:37:51 +00:00
Johannes Schickel
344caa88fc Make various Sound functionality SoundHandle instead of filename based.
- This fixes multiple sounds being played at once in Lands of Lore

svn-id: r40848
2009-05-24 01:29:09 +00:00
Johannes Schickel
ad4549f28d - Reorder supported codecs list
- Add changes for upcoming audio compression changes (file extensions changed to standard ones)

svn-id: r40843
2009-05-24 00:11:28 +00:00
Johannes Schickel
b28279accc Cleanup.
svn-id: r40841
2009-05-23 23:58:40 +00:00
Florian Kagerer
5a4b3c5441 KYRA/LOL: restructured voice playing code so that audio compression can be supported
svn-id: r40839
2009-05-23 23:33:31 +00:00
Johannes Schickel
e51481d69b Remove trailing tabs/whitespaces.
svn-id: r40760
2009-05-21 13:13:09 +00:00
Johannes Schickel
7561bd9dfb Remov lots of superfluous debug output.
svn-id: r40715
2009-05-19 01:13:29 +00:00
Florian Kagerer
dd84aaf648 LOL: - added some spell casting (spark, heal, swarm)
- fixed several bugs (not the one in the fighting system though)
- added several opcodes. there shouldn't be any real show stoppers in the draracle cave now.
- simplified wsa code (which required 4 lines of code for displaying a frame)
- added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file)

svn-id: r40420
2009-05-10 13:40:28 +00:00
Johannes Schickel
b01e82488d Fix for Kyra 1 Mac CD music (check bug report #2772727 "KYRA1: Sound effect loops continuously (Mac CD)").
svn-id: r40039
2009-04-21 11:26:19 +00:00
Florian Kagerer
6d9a047276 LOL: minor fix for text displayer (text pages now advance automatically when the speech has reached the next part)
svn-id: r39250
2009-03-09 00:54:27 +00:00
Florian Kagerer
6cb3f665af LOL: some more work on the text displayer so that it handles longer texts (needed for some library books)
svn-id: r39249
2009-03-08 23:28:19 +00:00
Travis Howell
4131d3d07f Fix sound noise regression in CD32 version of Simon the Sorcerer 1.
svn-id: r36236
2009-02-07 05:05:14 +00:00
Johannes Schickel
9df7f7385c - Cleanup
- This time fixed the real cause of the mismatching malloc / delete[] call.

svn-id: r36191
2009-02-01 21:11:03 +00:00
Johannes Schickel
4662333b81 Oops wrong parameter in last commit.
svn-id: r36187
2009-02-01 20:54:24 +00:00
Johannes Schickel
1aa84d4b5e - Fixed mismatching new[] / free.
- Fixed bad casting

svn-id: r36186
2009-02-01 20:53:30 +00:00
Johannes Schickel
574a7924df Implemented per voice volume control. (Used for example in LoL intro)
svn-id: r36184
2009-02-01 20:35:51 +00:00
Florian Kagerer
784c99b3da svn-id: r36178 2009-02-01 19:27:01 +00:00
Max Horn
2d866c0483 Renamed Kyra's Resource::getFileStream to createReadStream
svn-id: r36022
2009-01-23 04:57:18 +00:00
Johannes Schickel
1fc33dbae5 - Fix some valgrind warnings
- Added MIDI SFX support for Kyra2

svn-id: r35178
2008-11-30 02:47:20 +00:00
Johannes Schickel
893a79b01d Initial version of proper MIDI support for KYRA.
svn-id: r35174
2008-11-30 01:53:32 +00:00
Johannes Schickel
64fe71fed3 Added a member function loadSoundFile to Sound which accepts a filename string instead of a filename list id.
svn-id: r33527
2008-08-02 15:05:19 +00:00
Johannes Schickel
2e65c05991 Add warning when a voc file is not found.
svn-id: r33524
2008-08-02 14:35:43 +00:00
Torbjörn Andersson
6b2337740e Make sure _musicVolume and _sfxVolume are clipped to fit in a byte.
svn-id: r33266
2008-07-24 22:12:48 +00:00
Johannes Schickel
9a34ef702d Fixed mem leak in MIDI related code.
svn-id: r32987
2008-07-10 11:28:51 +00:00
Torbjörn Andersson
1cc9af6b10 Implemented Good Enough(TM) XMIDI looping. This is used by Kyrandia 2 (the
loop hack is no longer needed, and has been removed), and will be used by
Discworld.

svn-id: r32930
2008-07-06 18:37:52 +00:00
Johannes Schickel
3be34f071f Added support for compressed kyra3 audio files.
svn-id: r32516
2008-06-03 18:12:21 +00:00
Johannes Schickel
691306f0b7 Fixed KyraEngine_v1::snd_stopVoice and KyraEngine_v1::snd_voiceIsPlaying implementations.
svn-id: r32330
2008-05-27 21:04:27 +00:00
Johannes Schickel
64910f8c5f Little cleanup.
svn-id: r32262
2008-05-24 23:05:01 +00:00
Johannes Schickel
335eb1bf08 Committed my fix for bug #1497437 "KYRA1: Subtitles glitch during 'Speech of the Land'".
svn-id: r32260
2008-05-24 22:47:08 +00:00
Johannes Schickel
8d3116cf4a Cleanup.
svn-id: r32226
2008-05-23 11:35:05 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Johannes Schickel
3d9ea59616 Changed kyra to use delete[] instead of delete [].
svn-id: r31925
2008-05-07 14:20:37 +00:00
Johannes Schickel
a55d13e0a3 - Added volume param to KyraEngine::snd_playSoundEffect (0xFF per default as in original)
- Renamed KyraEngine_v3::playSoundEffect to KyraEngine_v3::snd_playSoundEffect
- Renamed KyraEngine_v3::playMusicTrack to KyraEngine_v3::snd_playWanderScoreViaMap
- Renamed KyraEngine_v3::o3_playMusicTrack to KyraEngine_v3::o3_playWanderScoreViaMap

svn-id: r31770
2008-04-29 14:08:08 +00:00
Johannes Schickel
9f16b3f5f5 Fixed regression in Kyra1.
svn-id: r31474
2008-04-10 20:42:56 +00:00
Johannes Schickel
5f3bfc702c - fixed valgrind warning
- reduced midi volume fadeout from 2s to 1s like HoF is doing (Kyra1 should use the same value)

svn-id: r31473
2008-04-10 19:33:06 +00:00
Johannes Schickel
924912b7fb Fixed track unloading for MIDI.
svn-id: r31472
2008-04-10 19:15:14 +00:00
Johannes Schickel
1bdc515880 Lock mutex in playSoundEffect, should help threading safeness of the code.
svn-id: r31469
2008-04-10 19:05:05 +00:00
Johannes Schickel
c13f2a73a3 Small fix related to all notes off event.
svn-id: r31468
2008-04-10 19:02:17 +00:00
Johannes Schickel
b54b9b34b4 - Updated debug output for KyraEngine::snd_playTheme
- cleanup

svn-id: r31464
2008-04-10 15:41:06 +00:00
Johannes Schickel
9377fc7dc8 Some MIDI related cleanup.
svn-id: r31443
2008-04-07 17:56:04 +00:00
Johannes Schickel
22992f4aa5 Implemented opcode 33 o2_loadSoundfile.
svn-id: r31425
2008-04-06 14:11:43 +00:00
Johannes Schickel
46376d38a9 - fixed bug in Sound::voiceIsPlaying
- fixed speech animation duration in Kyra1

svn-id: r31221
2008-03-22 14:29:30 +00:00
Johannes Schickel
a169619526 - Implemented opcode 97: o2_isAnySoundPlaying
- reworked sound channel handling in HoF
  => fixed some voice related bugs

svn-id: r31209
2008-03-21 16:18:27 +00:00
Florian Kagerer
753536fa61 committing patch 1891492 : dialogue (dlg/tim) support for HoF
- talking to NPCs is now possible.
- Zanthia's talks when entering a new scene for the first time now work
- using items on Zanthia is now possible.

svn-id: r30886
2008-02-17 02:06:04 +00:00
Johannes Schickel
ae0b605ad4 Reworked Kyrandia resource loading code.
svn-id: r30820
2008-02-07 23:13:13 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Johannes Schickel
4f8cf19292 Commit patch #1869749 "KYRA: HoF Towns Audio fix".
svn-id: r30438
2008-01-12 08:04:00 +00:00
Johannes Schickel
58f0d4e632 Committed slightly modified patch #1862758 "KYRA: audio data assignment patch".
svn-id: r30198
2008-01-03 14:42:49 +00:00
Johannes Schickel
35e72866ec Simplification of GM vs MT-32 detection.
svn-id: r29997
2007-12-26 01:09:46 +00:00