Commit Graph

127 Commits

Author SHA1 Message Date
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
Johannes Schickel
3d9ea59616 Changed kyra to use delete[] instead of delete [].
svn-id: r31925
2008-05-07 14:20:37 +00:00
Filippos Karapetis
9c59043664 Silenced MSVC warning
svn-id: r31434
2008-04-06 15:23:18 +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
82c2f1203e Cleaned up volume settings managment.
svn-id: r31385
2008-04-04 18:09:19 +00:00
Johannes Schickel
f919b26875 - fixed multiple voices playing at once (see bug #1926547 "HoF: Right mouse button messes up gameplay").
- fixed crash while uninitializing AdLib driver

svn-id: r31252
2008-03-26 21:39:44 +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
e946eff205 Added a hack to allow adjustment of Adlib volume. (see bug #1497961 "KYRA1: music/sfx volume settings not working")
svn-id: r29808
2007-12-09 23:55:57 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Johannes Schickel
21b2c7bceb Formatting/Cleanup.
svn-id: r26511
2007-04-15 16:41:20 +00:00
Johannes Schickel
397c10f059 made _vm/_engine usage consistent. (_engine -> _vm all over the place now).
svn-id: r26342
2007-04-01 13:10:50 +00:00
Max Horn
227a080e5b Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me
svn-id: r25752
2007-02-20 18:50:17 +00:00
Torbjörn Andersson
546758a086 Only set up the Kyra 1 triggers for Kyra 1, not Kyra 2.
svn-id: r25650
2007-02-17 08:06:21 +00:00
Johannes Schickel
940e89d00e Added support for Kyrandia 2 ADL files.
svn-id: r25634
2007-02-16 16:57:59 +00:00
Johannes Schickel
1bbad356ef - adds support for FM-Towns SFX (thanks to Florian Kagerer for his source)
- gets rid of GameFlags::hasAudioCD

svn-id: r25258
2007-01-29 18:15:14 +00:00
Johannes Schickel
4cf1c3565b little parameter reodering.
svn-id: r25201
2007-01-26 13:09:48 +00:00
Johannes Schickel
7d0435f23c - adding LPGL headers to adlib sound specific files
- stating about dual license of adlib sound specific files

svn-id: r23708
2006-08-15 18:04:01 +00:00
Torbjörn Andersson
44dd6a386e Committed my own patch #1533833 (minus one line that was left over from an
earlier experimental version) after discussing it with LordHoto. This works
around a bug in the "Pool of Sorrow" Adlib data which caused the channels to
drift more and more out of sync for each time the music looped. The patch
forces the channels involved to jump in sync. As with all such workarounds, it
may cause regressions. But it shouldn't.

svn-id: r23659
2006-08-03 13:11:16 +00:00
Torbjörn Andersson
ec6a9b0071 Removed unnecessary #include
svn-id: r23598
2006-07-26 06:36:58 +00:00
Johannes Schickel
6ac60c9c7b Fix for bug # 1497961 ("KYRA1: in-game "Music" option not working").
svn-id: r22844
2006-06-02 22:57:02 +00:00
Johannes Schickel
1750be5b5a - makes Screen::getPagePtr private
- introduces Screen::getCPagePtr and Screen::getPageRect (which should ease the introduction of dirty rect handling)
- moves KyraEngine::loadBitmap to Screen

svn-id: r22716
2006-05-28 12:19:45 +00:00
Johannes Schickel
727f66de39 Commits Chriliths patch for fixing Kyra on PalmOS.
svn-id: r22708
2006-05-28 11:43:04 +00:00
Johannes Schickel
a5b4fb7f18 - little cleanups
- adds kyra3 dummies

svn-id: r22425
2006-05-12 23:57:53 +00:00
Max Horn
27307acd7c Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
2006-04-29 22:33:31 +00:00
Max Horn
cf202049ff Fixing mismatch between format strings and data on some systems
svn-id: r21827
2006-04-12 14:54:12 +00:00
Jonathan Gray
eb3ae7d726 sizeof(void *) != sizeof(int) for a large number of systems.
Fix a lot of debug/error statements that were using %d/%x
for the result of pointer arithmetic.

As C++ apparently has no format string for ptrdiff_t use
%lu/%lx as appropriate.

svn-id: r21824
2006-04-12 10:01:41 +00:00
Torbjörn Andersson
23c692f09f Cleaned up update_playRhythmSection(). It's almost possible to understand what
it's intended to do now.

Renamed _unkOutputByte2 to _vibratoAndAMDepthBits. It's a pretty terrible name,
but that's what it is: the two most significant bits of the Adlib BD register.

Renamed _rhythmSection to _rhythmSectionBits for consistency: It's the five
least significant bits of the Adlib BD register.

(The remaining bit is the rhythm on/off bit. I don't think we store that one in
any variable.)

svn-id: r21463
2006-03-26 22:11:40 +00:00
Torbjörn Andersson
737c52590b I believe that the purpose of updateCallback45() is to add a signed value to a
channel's unsigned tempo. Rewrote the function to make this clearer, and
renamed it update_changeChannelTempo().

svn-id: r21448
2006-03-25 10:11:38 +00:00