ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,292 Commits 45 Branches 139 Tags
7331a7cbefed7be415da170a32a2549b1c18fd12
Commit Graph
155 Commits
Author SHA1 Message Date
Johannes Schickel 8d5b4b75d4 KYRA: Make all hex constants use uppercase letters. 
Done with:
git ls-files "*.cpp" *".h" | xargs sed -i -e 's/0x\([0-9a-f]*\)/0x\U\1/g'
 2013-01-09 06:01:28 +01:00
Johannes Schickel f361a7d624 KYRA: Make Sound::hasSoundFile const again. 2012-11-23 02:50:20 +01:00
athrxx 93e69aa4da KYRA: clean up audio resource handling 
(this was really ugly, now it's somewhat less ugly)
 2012-11-11 19:14:31 +01:00
athrxx eaa5d50c3f KYRA: (EOB) - add basic distinction between music and sound effects 
(The original code of the DOS version does not distinguish here, but
we do it anyway so as to make more sense of the GMM volume settings)
 2012-01-06 14:45:38 +01:00
athrxx 0aa3238523 KYRA: (EOB/LOL) - rename some vars 
(all cases of Eob to EoB, all cases of Lol to LoL, all cases of LolEobCommon to RpgCommon)
 2011-12-26 16:18:16 +01:00
athrxx 814c78e84e KYRA: (AdLib Driver) - fix queue handling for Eob 
Huge numbers of sound effects get started as soon as a couple of monsters are around. If we start dropping sound when the queue is full, we won't have any sounds in these situations, but we'll get tons of useless warnings instead.
 2011-12-26 16:18:10 +01:00
athrxx 2bcae2451a KYRA: (AdLib Driver) - prevent squashing of sounds during halt track execution 
This patch makes sure that the stopping track (track 0) does not squash sounds which get queued during the execution of the stopping track. This seems to be a hardware problem (original driver implementation not suitable for modern machines).
 2011-12-26 16:18:10 +01:00
athrxx 2da431aa65 KYRA: (AdLib Driver) - increase versions and add necessary EOB modifications 2011-12-26 16:18:09 +01:00
athrxx 93321ca485 KYRA: (AdLib Driver) - fix secondary effect 2011-12-26 16:18:09 +01:00
athrxx 86a8f694c0 KYRA: (AdLib Driver) - rename some variables to make more sense 2011-12-26 16:18:09 +01:00
athrxx 4098feff57 KYRA: (AdLib Driver) - allow sound trigger query 2011-12-26 16:18:09 +01:00
athrxx f2a1ff3f78 KYRA: (AdLib Driver) - fix invalid memory write issue 2011-12-26 16:18:09 +01:00
athrxx 77a81a80b4 KYRA: (AdLib Driver) - implement sound effects volume 
(also make internal driver version more flexible)
 2011-12-26 16:18:09 +01:00
Johannes Schickel a588d6e3e2 KYRA: Add another delay for new tracks in the AdLib driver. 
This is to play really safe and to avoid messing up of sound data.
 2011-10-29 02:50:52 +02:00
Johannes Schickel 488fb5c14b KYRA: Fix haltTrack and beginFadeOut for AdLib driver. 
Formerly the were not executed properly when the sfx output was disabled.
 2011-10-29 02:40:50 +02:00
Johannes Schickel 8ea2d5dbb1 KYRA: Simplify AdLib output code a bit. 
This might cause nasty regressions, since it changes the way sounds are
started. On the other hand it gets rid of the low level driver interface
which was implemented before. And it should be a bit better secured against
race conditions.
 2011-10-29 02:37:44 +02:00
Johannes Schickel d0bc84d5b7 KYRA: Implemented LoL style volume control in AdLib output. 2011-10-29 01:00:18 +02:00
Johannes Schickel 6da0549133 KYRA: Fix minor bug in AdLibDriver::primaryEffect1. 2011-10-02 02:17:59 +02:00
Johannes Schickel a3a40c4a6f KYRA: Fix bumping into a wall AdLib SFX in Lands of Lore. 2011-10-02 01:49:27 +02:00
Johannes Schickel 88fa659ace KYRA: Name another variable in the AdLib output code. 2011-10-02 00:13:41 +02:00
Johannes Schickel 2dd85c0cad KYRA: Some minor cleanup. 2011-10-02 00:13:41 +02:00
Johannes Schickel 1fa858d339 KYRA: Made some more static data const. 2011-09-08 00:33:10 +02:00
Christoph Mallon 23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
Matthew Hoops 9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel 7d03da14cb KYRA: Clean up of header includes. 2011-04-28 15:39:57 +02:00
Johannes Schickel 64c4e65201 KYRA: Enforce use of American English in comments. 2011-04-14 14:03:07 +02:00
Max Horn 42ab839dd6 AUDIO: Rename sound/ dir to audio/ 
svn-id: r55850
 2011-02-09 01:09:01 +00:00
Johannes Schickel 607920c869 KYRA: Fix some code errors reported by ICC (i.e. subclasses not overwriting methods by missing a const.) 
svn-id: r53911
 2010-10-28 23:56:36 +00:00
Johannes Schickel feff6fecdf KYRA: Cleanup. 
svn-id: r52340
 2010-08-24 13:41:24 +00:00
Johannes Schickel 0fe2ba6a0d Some more enforcement of our formatting conventions in KYRA too. 
svn-id: r49069
 2010-05-17 23:29:44 +00:00
Max Horn a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Johannes Schickel cf85c0b318 Fix bug #2985387 "KYRA1: Crash at the end of game". 
svn-id: r48617
 2010-04-11 15:05:26 +00:00
Johannes Schickel 0d995c5920 Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company. 
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279
 2010-01-12 21:07:56 +00:00
Max Horn f720d99b0a Switch Mixer::playInputStream to use DisposeAfterUse::Flag 
svn-id: r47182
 2010-01-08 22:09:43 +00:00
Johannes Schickel c671c17258 Use Common::StackLock. 
svn-id: r46870
 2010-01-02 00:54:11 +00:00
Johannes Schickel 8817d6eeb5 Merge update_nop1 and update_nop2. 
svn-id: r46860
 2010-01-01 22:33:45 +00:00
Johannes Schickel 82b4b65bdc - Fix out of bounds array access. 
- Add some asserts in output related functions

svn-id: r46859
 2010-01-01 22:26:26 +00:00
Johannes Schickel 671cc15bd1 - Add some asserts 
- Renamed snd_unkOpcode3 to snd_stopChannel
- Cleanup

svn-id: r46855
 2010-01-01 21:59:11 +00:00
Max Horn f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency 
svn-id: r44634
 2009-10-04 21:26:33 +00:00
Johannes Schickel 64e6c596c7 Formatting. 
svn-id: r40991
 2009-05-29 12:52:03 +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 29cf3ed1a4 Add support for music in the LoL intro demo. 
svn-id: r40706
 2009-05-18 21:56:09 +00:00
Johannes Schickel 9c560ed94b Cleanup. 
svn-id: r40200
 2009-04-29 11:50:13 +00:00
Eugene Sandulenko 696897b058 Whoa! Removing trailing spaces. 
svn-id: r35648
 2009-01-01 15:06:43 +00:00
Johannes Schickel 6eab0dcc6e Preliminary support for loading via GMM for KYRA engine. 
svn-id: r34885
 2008-11-03 19:51:34 +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 5e0df8ad8e Committed slightly modified patch #2029395 "KYRA: Lands of Lore Intro + Character selection". 
svn-id: r33463
 2008-07-31 10:47:15 +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 a83d79bafd Fixed typos. 
svn-id: r31965
 2008-05-09 13:33:31 +00:00