Commit Graph

262 Commits

Author SHA1 Message Date
Max Horn
cca744f69a Comply to our coding conventions
svn-id: r17975
2005-05-08 21:49:52 +00:00
Max Horn
00f73aeeca Reduce dependencies on saveload.h
svn-id: r17816
2005-04-26 13:17:11 +00:00
Max Horn
7963bb4cb9 Renamed _mouseButStat -> _mouseAndKeyboardStat (that's what it really is); moved _audioNames to class IMuseDigital
svn-id: r17723
2005-04-20 23:33:35 +00:00
Max Horn
871e278f8b Reduce dependencies on scumm/util.h; modified ScummNESFile a bit so that it complies a bit better with our code formatting rules
svn-id: r17508
2005-04-10 12:59:17 +00:00
Max Horn
2787e5aab4 Change some iMuseDigital debug messages
svn-id: r17455
2005-04-08 20:51:34 +00:00
Paweł Kołodziejski
aa50d6d7b0 revert last change, it's too much experimental
svn-id: r17349
2005-04-03 17:11:06 +00:00
Max Horn
ac247c9b94 Started to move some resource related code into a new class ResourceManager (hypothetic goal for the future: use ResourceManager in ScummEx)
svn-id: r17311
2005-03-31 21:39:31 +00:00
Max Horn
7cd2cb2b17 PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
svn-id: r17106
2005-03-12 18:56:09 +00:00
Paweł Kołodziejski
8de216f3ae some experimental changes
svn-id: r17105
2005-03-12 18:54:06 +00:00
Paweł Kołodziejski
03051c1501 backport fix from residual imuse
svn-id: r17100
2005-03-12 16:05:25 +00:00
Eugene Sandulenko
154c4af8dc Mass-renamed all variables of Actor object according to our current code
formatting standards. Earlier we had half of vars named with leading
underscore and half without it.

Now code in actor.cpp is considerably more readable.

svn-id: r17068
2005-03-11 01:10:06 +00:00
Max Horn
0ec193b4be changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
2005-03-09 18:12:54 +00:00
Max Horn
630bdf542d Oops
svn-id: r17015
2005-03-06 23:16:45 +00:00
Max Horn
81eadf1a35 Fix for bug #1153648 (Compressed BUN files play incorrectly on BE systems)
svn-id: r17014
2005-03-06 23:15:57 +00:00
Paweł Kołodziejski
ddd97c96da fix/workaround for bug: 1120625
svn-id: r16779
2005-02-12 15:00:16 +00:00
Paweł Kołodziejski
ac72fcd63d return null if sound is not found
svn-id: r16737
2005-02-06 10:09:37 +00:00
Paweł Kołodziejski
292eaa08b0 added support for *.map files version 2
svn-id: r16709
2005-01-30 20:45:02 +00:00
Nicolas Bacca
83e9ca19df Fix mp3/vorbis detection
svn-id: r16681
2005-01-28 23:30:51 +00:00
Max Horn
abd12dd1b6 Use class Mutex instead of MutexRef
svn-id: r16679
2005-01-28 22:05:51 +00:00
Paweł Kołodziejski
6feb7ae90f more proper checks
svn-id: r16667
2005-01-28 15:04:37 +00:00
Torbjörn Andersson
d25ac7c951 Indentation
svn-id: r16666
2005-01-28 14:55:52 +00:00
Paweł Kołodziejski
912c669977 added error message for lack of library support
svn-id: r16663
2005-01-28 14:42:47 +00:00
Paweł Kołodziejski
ac06b41894 fixed restoration of sounds params after cross non/compressed bundles
svn-id: r16660
2005-01-28 11:51:57 +00:00
Paweł Kołodziejski
ad7cc6cef4 add checks for mad and vorbis define
svn-id: r16659
2005-01-28 11:43:25 +00:00
Paweł Kołodziejski
e891988298 double check
svn-id: r16658
2005-01-28 11:21:38 +00:00
Paweł Kołodziejski
9171951cf9 ah, forgot that
svn-id: r16657
2005-01-28 11:16:21 +00:00
Paweł Kołodziejski
730aad6a86 added support for mp3 compressed bundles
svn-id: r16656
2005-01-28 11:03:34 +00:00
Paweł Kołodziejski
a5a02d3f43 clear compressed entries before restore for compatibility with old savegames
svn-id: r16655
2005-01-28 10:58:02 +00:00
Paweł Kołodziejski
46c2a49e86 fix for shadowed variable
svn-id: r16646
2005-01-27 16:48:30 +00:00
Paweł Kołodziejski
d1713410f2 fix for shadowed variable
svn-id: r16643
2005-01-27 12:08:09 +00:00
Paweł Kołodziejski
55aa56dbdc fix for compressed bun sounds
svn-id: r16641
2005-01-26 14:11:27 +00:00
Paweł Kołodziejski
065a27daab added support for compressed bun files
svn-id: r16639
2005-01-25 22:21:26 +00:00
Paweł Kołodziejski
beb5395d54 fixed volume channel in fade track
svn-id: r16638
2005-01-25 21:36:01 +00:00
Max Horn
ec79a9a768 A little more moving around #include's (last one for today ;-)
svn-id: r16534
2005-01-10 22:51:42 +00:00
Max Horn
cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
2005-01-10 22:06:49 +00:00
Max Horn
32f0dbdcb2 Moving AppendableAudioStream into SCUMM engine, as it is only used there
svn-id: r16494
2005-01-09 03:15:59 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
f15f517bb4 Add 'speech' sound type to mixer; make use of that in iMuse Digital
svn-id: r16331
2004-12-27 01:32:40 +00:00
Max Horn
67b311713d Added 'sound types' to the mixer - for now, only plain (for the premixer), SFX and music; volume is now controlled based on the sound type
svn-id: r16330
2004-12-27 00:27:00 +00:00
Max Horn
10dd548b85 Changed parameter order of SoundMixer::playInputStream to match that of playRaw
svn-id: r15950
2004-11-28 23:02:28 +00:00
Max Horn
1ae87c0fbb Trying to cleanup the volume control mess inside the SCUMM engine: renamed MusicEngine::setMasterVolume to setMusicVolume; fixed iMuse to use the correct method for setMusicVolume (previously modified the iMuse internal volume control); hooked up the volume control of various other music engines; added ScummEngine::setupVolume method which can be called whenever volume settings change, and which gurantees that those are handled uniformly
svn-id: r15944
2004-11-28 21:24:02 +00:00
Torbjörn Andersson
ecc7b79a44 Initialize variable to avoid warning and possibly undefined behaviour.
svn-id: r15879
2004-11-25 07:09:30 +00:00
Max Horn
147a09bcf5 (Partial) fix for bug #1035690 (COMI: cannon shooting uses a lot of performance) -- remember, busy waiting is almost always bad, esp. when waiting for another thread...
svn-id: r15875
2004-11-24 10:00:02 +00:00
Max Horn
666d7d106d Some code transformations (no functional change)
svn-id: r15874
2004-11-24 09:47:32 +00:00
Max Horn
eb9404beb8 This is really an IMA codec...
svn-id: r15776
2004-11-10 01:44:46 +00:00
Eugene Sandulenko
3ebaf08d6c Fix compilation.
svn-id: r15598
2004-10-17 21:34:37 +00:00
Max Horn
ea9d53be79 cleanup
svn-id: r15597
2004-10-17 19:40:34 +00:00
Max Horn
86113ad042 Fix doxygen warning
svn-id: r15452
2004-10-07 21:18:54 +00:00
Max Horn
ce8c99bf62 Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
2004-09-28 20:19:37 +00:00
Max Horn
61b7e2155a Fix doxygen warnings
svn-id: r15277
2004-09-25 23:26:46 +00:00