Jonathan Gray
fcc52b238b
remove unused variable which is also incorrectly cast...
...
svn-id: r8948
2003-07-12 15:38:27 +00:00
James Brown
d50009b7c7
Preemptive code cleanup to prevent ear damage during certain Euphony tunes
...
svn-id: r8947
2003-07-12 15:27:41 +00:00
Jonathan Gray
dfdebc39ae
add support for MRAW/dmu files in 3DO humongous games, has the overlapping music problem again so will probably have to play music via digital imuse at some point
...
svn-id: r8803
2003-07-06 15:02:13 +00:00
Max Horn
98027c2072
the amiga check should be separate since the big FIXME comment does not apply to it at all
...
svn-id: r8798
2003-07-06 10:39:02 +00:00
Travis Howell
bdbd7c98bf
Add back change that got lost on last two commits
...
svn-id: r8795
2003-07-06 07:17:50 +00:00
Travis Howell
81871c5ad0
zak256 sound updates from Hibernatus
...
svn-id: r8793
2003-07-06 06:47:26 +00:00
Travis Howell
580e9ec770
Add support for Amiga version of Monkey Island 1
...
Palette is still wrong
svn-id: r8790
2003-07-06 06:19:52 +00:00
James Brown
093a31839b
Insert preliminary Zak256 sound looping support. It's not perfect, as some Zak256 sounds only loop a part of the sample - which our mixer API doesn't yet support.
...
svn-id: r8741
2003-07-04 14:10:44 +00:00
Max Horn
470b406587
oops
...
svn-id: r8738
2003-07-04 12:35:08 +00:00
Max Horn
fb16fb3e24
added some very limited support for Mac Loom (text is now properly centered around x:160 instead of x:0); added (commented out) copyprot bypass (but since I am not sure if there was ever a Mac Loom w/o codes, am not sure if this ever should be enabled); added comment regarding the Mac Loom sound format
...
svn-id: r8737
2003-07-04 12:34:09 +00:00
Max Horn
fe8719d7bd
more cleanup
...
svn-id: r8707
2003-07-02 11:04:48 +00:00
Max Horn
2cb05bedb9
possible fix for bug #763714 : DIG: 'Trying to append to a nonexistant stream 0'
...
svn-id: r8697
2003-07-02 00:46:24 +00:00
Max Horn
095b68d74f
partially implemented the Audio CD query opcode in Zak256 (see bug #762589 ); cleanup
...
svn-id: r8680
2003-06-30 23:18:20 +00:00
Max Horn
67a1aa89db
Fixes as per bug #762593 (Zak256 Audio CD handling); some cleanup (e.g. renamed start/delay -> startFrame/endFrame)
...
svn-id: r8679
2003-06-30 22:25:08 +00:00
Max Horn
c52337b128
fix for bug #755899 (thanks Hibernatus)
...
svn-id: r8677
2003-06-30 20:50:52 +00:00
Max Horn
c10905b975
cleanup
...
svn-id: r8662
2003-06-27 00:10:17 +00:00
Max Horn
aa19687a4c
fixed memory leak when restarting
...
svn-id: r8661
2003-06-26 23:04:41 +00:00
Max Horn
7f3118f8d8
more const qualifiers
...
svn-id: r8649
2003-06-25 23:49:54 +00:00
Max Horn
870ce2879e
added some const qualifiers; moved _bundle & _current_cd_sound from class Scumm to class Sound; some other tweaks
...
svn-id: r8648
2003-06-25 23:25:52 +00:00
Paweł Kołodziejski
a1f760b944
this should prevent changing music in some room in the DIG
...
svn-id: r8641
2003-06-23 21:23:10 +00:00
Max Horn
4ead10e4d5
Change names of the stream API in the mixer; added endStream method (stop() halts stream immediately; endStream() lets it first finish playing)
...
svn-id: r8603
2003-06-22 11:47:03 +00:00
Max Horn
4ad5a183ce
renamed SoundMixer::hasActiveChannel->hasActiveSFXChannel, and fixed the regression in it caused by removing _beginSlots (I hope); added isActiveChannel method used by scumm/sound.cpp (this allowed me to move the Channel class from mixer.h into mixer.cpp); replaced Channel::soundFinished method by isActive
...
svn-id: r8597
2003-06-22 01:55:53 +00:00
Max Horn
bd4370c251
lots of mixer cleanup / refactoring / reengineering
...
svn-id: r8594
2003-06-21 23:29:34 +00:00
Max Horn
7c332d7fdb
modified & cleaned up the playStream/append code a bit; but this API really could stand some refinement
...
svn-id: r8592
2003-06-21 21:17:08 +00:00
Jonathan Gray
20b3ba1d28
add id for segacd monkey island and don't attempt to play sbl sounds for now
...
svn-id: r8555
2003-06-19 12:29:13 +00:00
Max Horn
101df28e0b
moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies)
...
svn-id: r8496
2003-06-15 01:42:19 +00:00
Max Horn
f1fc68773d
made stuff in class Sound protected where possible; moved readCreativeVocFile to imuse_digi.cpp and turned it into a static function; put the DigitalTrackInfo stuff into sound.cpp (keeping it private); removed #includes from sound.h (this cuts down interdependencies a little)
...
svn-id: r8493
2003-06-15 00:54:14 +00:00
Max Horn
f7a8cbf7c7
Patch #754151 : Removed READ_*_UNALIGNED and always read stuff bytewise; augmented by some more changes of mine
...
svn-id: r8482
2003-06-14 18:52:30 +00:00
Torbjörn Andersson
6c1a5573af
Cast %c error() parameters to byte before printing, like we do elsewhere.
...
svn-id: r8461
2003-06-13 18:09:18 +00:00
Max Horn
49b9a8fc9d
follow our coding conventions
...
svn-id: r8377
2003-06-07 00:49:36 +00:00
Max Horn
86df3537b9
replaced GF_AFTER with _version
...
svn-id: r8372
2003-06-07 00:13:26 +00:00
Travis Howell
97aaab9410
Don't attempt to play music/sfx on v1 games
...
svn-id: r8292
2003-06-04 13:33:50 +00:00
Max Horn
f8ab6ad8da
wtf is this doing here?!
...
svn-id: r8269
2003-06-02 10:17:46 +00:00
Max Horn
8b39e81afe
cleanup
...
svn-id: r8236
2003-06-01 13:11:30 +00:00
Jonathan Gray
a871dfafaf
don't attempt to play sound on amiga versions of zak/maniac
...
svn-id: r8029
2003-05-26 23:23:44 +00:00
Jamieson Christian
dbad55e532
Added Hoenicke's PC-speaker waveform generator
...
and script interpreter for GF_OLD_BUNDLE music resources.
We'll try to get the waveform generator into a
MidiDriver wrapper for use with the 'SPK' resources
of later games, but this is usable for now.
Great work, Hoenicke!
svn-id: r8023
2003-05-26 22:03:04 +00:00
Max Horn
54835862fb
cleanup
...
svn-id: r7920
2003-05-25 00:30:48 +00:00
Max Horn
95b7e01548
cleanup
...
svn-id: r7919
2003-05-25 00:04:16 +00:00
Max Horn
cb76f85ca6
correction for zak256 SFX
...
svn-id: r7918
2003-05-24 23:51:57 +00:00
Max Horn
4cda099c57
don't use _gameDataPath directly; minor cleanup
...
svn-id: r7907
2003-05-24 22:13:01 +00:00
Jamieson Christian
eb09051517
Added XMIDI support to IMuse. IMuse now plays music from Humongous games.
...
Added some IMuse property options to support some assumptions that seem to be made by Humongous games.
This is still preliminary. It will play music, and it will switch between songs. But I don't know if it's switching to the right song at the right time.
svn-id: r7869
2003-05-23 18:35:53 +00:00
Max Horn
c333b6d6ec
replaced many unsafe uses of derefActorSafe by derefActor; replaced derefActorSafe/assert pairs by derefActor (gives better error message); replaced various derefActorSafe/if(a!=0) pairs by derefActor (in cases where the deref should never fail, ever, except due to a bug in ScummVM)
...
svn-id: r7859
2003-05-23 13:24:41 +00:00
Max Horn
c78664cbc9
renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame
...
svn-id: r7819
2003-05-22 09:58:33 +00:00
Max Horn
86d57f3c7a
many pedantic warning fixes (and some actual potential buglets fixed, too)
...
svn-id: r7795
2003-05-21 18:09:49 +00:00
Max Horn
8d1110bfee
init all Bundle members properly; make _voiceFile/_musicFile protected
...
svn-id: r7718
2003-05-20 11:56:36 +00:00
Jamieson Christian
ad39f15e05
Auto loop for non-puttdemo games
...
svn-id: r7693
2003-05-19 18:49:16 +00:00
Jonathan Gray
6cb61537f4
enable midi for non puttdemo humongous games. need to properly return the result of whether music is running though...
...
svn-id: r7673
2003-05-19 08:04:47 +00:00
Jamieson Christian
e088227e3b
Removed annoying debug output
...
svn-id: r7671
2003-05-19 05:14:18 +00:00
Jamieson Christian
417dc08484
Proof of concept for XMIDI parser in Humongous games.
...
You must still uncomment the VAR_SOUNDPARAM setting for this to work...?
svn-id: r7670
2003-05-19 05:04:38 +00:00
Max Horn
b43ea06a80
fixed illegal var access in V7/V8 games
...
svn-id: r7475
2003-05-12 19:53:18 +00:00
