Commit Graph

93 Commits

Author SHA1 Message Date
Johannes Schickel
51fc019a9b Implement "loadSfxFile" and "stopAllSoundEffects" for "MixedSoundDriver".
svn-id: r41011
2009-05-29 17:21:00 +00:00
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
2bcf5c0552 - Moved Sound implementation declarations to the newly added file sound_intern.h
- Added support for PC Speaker sound in all Kyra1, Kyra2 and Lands of Lore
- Slight cleanup

svn-id: r40939
2009-05-27 14:40:37 +00:00
Johannes Schickel
7c1eb05714 Strip trailing whitespaces.
svn-id: r40866
2009-05-24 15:06:28 +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
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
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
Florian Kagerer
ccb64ad81e LOL: - Started implementing the fighting system. The damage inflicted is wrong, however (at least the damage inflicted by the monsters). I'm sowewhat clueless about that bug atm.
- added support for monsters with distance attacks (like those orcs in front of roland's house)
- lots of small bug fixes
- Some startup support for the pc-98 16 color version. The intro will run, but the font drawing/coloring is still wrong.

svn-id: r40144
2009-04-25 13:15:05 +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
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
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Johannes Schickel
2f1babd370 Whoops changed integer size of variables storing volume information, now volume of 256 should work as expected.
svn-id: r35303
2008-12-11 13:54:18 +00:00
Johannes Schickel
c7c074895a Prevent MIDI files from being load, when they are already loaded.
svn-id: r35272
2008-12-07 13:12:09 +00:00
Johannes Schickel
c517045349 Fixed some looping MIDI sound effects.
svn-id: r35193
2008-11-30 15:15:14 +00:00
Johannes Schickel
17a699a438 Cleanup.
svn-id: r35179
2008-11-30 02:54:39 +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
8142873c6a Implement fade out support for MIDI.
svn-id: r35177
2008-11-30 02:38:08 +00:00
Johannes Schickel
893a79b01d Initial version of proper MIDI support for KYRA.
svn-id: r35174
2008-11-30 01:53:32 +00:00
Florian Kagerer
807bfe5079 - KYRA: FM-Towns/PC-98 Audio: fixed several bugs and got rid of some floating point arithmetic (or at least replaced some doubles with floats)
- Improved support for PC-98 music: HOF tracks seem to be fine, KYRA should be okay, too (I can't compare with an emulator since I am missing the floppy boot disk with the executable)
- There are still tempo issues. Some tracks play way too slow, others way too fast
- PC-98 sound effects in Kyra 1 don't work (I would need the floppy disk with the executable for that)

svn-id: r33938
2008-08-16 12:38:37 +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
Florian Kagerer
b0e22db7a8 - some more work on the Hof FM-Towns/PC98 music driver
- move channels to a separate class

svn-id: r32841
2008-06-29 15:25:45 +00:00
Florian Kagerer
7b30081be2 - improved hof music support for fm-towns (driver for *.twn tracks) (still needs quite some work)
- some PC-98 music support since it uses a very similar driver, but this can't be considered working yet)
- Kyra 1 PC-98 music doen't work at all since I haven't figured out yet how to turn track numbers into the corresponding music file names (might require a hard coded track map)

svn-id: r32807
2008-06-26 19:42:59 +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
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
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
4b21c2958d Implemented helium mode support for Kyra3.
svn-id: r32028
2008-05-11 17:50:13 +00:00
Johannes Schickel
a83d79bafd Fixed typos.
svn-id: r31965
2008-05-09 13:33:31 +00:00
Johannes Schickel
b53fe83695 Silenced some g++ 4.3 warnings.
svn-id: r31956
2008-05-08 21:23:14 +00:00
Johannes Schickel
87f10ebe40 Committed patch removing Audio::Mixer::SoundType alias in Kyra::SoundDigital.
svn-id: r31632
2008-04-20 22:24:24 +00:00
Johannes Schickel
d484c7ed43 Improved sound priority handling.
svn-id: r31598
2008-04-20 14:36:39 +00:00
Johannes Schickel
96fd18a13b Implemented sound priority handling.
svn-id: r31597
2008-04-20 14:25:37 +00:00
Johannes Schickel
eb2ffce2fd Implemented volume handling for SFX.
svn-id: r31548
2008-04-17 17:57:16 +00:00
Johannes Schickel
0f34c16c1e Cleanup.
svn-id: r31547
2008-04-17 17:49:18 +00:00
Johannes Schickel
87256747b1 Implemented sfx support for Kyra3.
svn-id: r31546
2008-04-17 17:46:39 +00:00
Johannes Schickel
853b6e28e9 Implemented some kyra3 code.
svn-id: r31503
2008-04-14 20:20:51 +00:00
Johannes Schickel
d54eaa39a1 Added fade out time parameter for digital sounds.
svn-id: r31489
2008-04-12 23:26:13 +00:00
Johannes Schickel
9377fc7dc8 Some MIDI related cleanup.
svn-id: r31443
2008-04-07 17:56:04 +00:00
Johannes Schickel
a05b085a21 Fixed potentional crash.
svn-id: r31432
2008-04-06 14:58:02 +00:00
Johannes Schickel
2755727249 Cleanup.
svn-id: r31426
2008-04-06 14:13:14 +00:00
Johannes Schickel
22992f4aa5 Implemented opcode 33 o2_loadSoundfile.
svn-id: r31425
2008-04-06 14:11:43 +00:00
Johannes Schickel
a2e355d671 Implemented fadeout waiting in KyraEngine_v2::enterNewScene for AdLib.
svn-id: r31424
2008-04-06 13:57:28 +00:00
Johannes Schickel
21a66f12ba - Fixed HACKs in o2_getMusicDriver and o2_getSfxDriver
- Implemented missing bits in KyraEngine_v2::enterNewScene for MIDI (AdLib code still missing)
- Added music/sfx type to Sound class

svn-id: r31423
2008-04-06 13:32:41 +00:00
Johannes Schickel
82c2f1203e Cleaned up volume settings managment.
svn-id: r31385
2008-04-04 18:09:19 +00:00
Florian Kagerer
221e6bb84f - some accuracy changes for KyraEngine_v2::snd_playSoundEffect()
- fix one more skip flag bug in the sequence player
- fix SoundTowns_v2::voicePlay()

svn-id: r31278
2008-03-28 00:07:40 +00:00
Johannes Schickel
b615eb177b Cleanup.
svn-id: r31210
2008-03-21 16:21:27 +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