6511 Commits

Author SHA1 Message Date
Travis Howell
c3d61acd5c Remove warning
svn-id: r10000
2003-09-05 07:38:36 +00:00
Travis Howell
3187b565dd Add atarist and macintosh options, since there seem to be no way to detect version been used.
svn-id: r9999
2003-09-05 07:36:05 +00:00
Paweł Kołodziejski
7bc63a0ce3 fixes for uninitialized pan and volume
svn-id: r9998
2003-09-05 06:22:10 +00:00
Travis Howell
fccc9a2abb Changeing warning to debug, since we know functions purpuse and it seems to be confusing people.
svn-id: r9997
2003-09-05 03:55:48 +00:00
Travis Howell
5f1c67424d Correction from Hibernatus, is used in fm towns games too.
svn-id: r9996
2003-09-05 03:51:56 +00:00
Jonathan Gray
bb9a4bbfcc comment unused label
svn-id: r9995
2003-09-05 03:46:30 +00:00
Travis Howell
df963e48bd Corrections for Amiga V2/V3 games from unused.
svn-id: r9994
2003-09-05 03:29:29 +00:00
Travis Howell
16f0cce0bb Leave SPK resources in monkey1 disabled too.
svn-id: r9993
2003-09-04 15:24:58 +00:00
Travis Howell
2f800e4b32 monkey has no native midi resources and SPK isn't support yet.
svn-id: r9992
2003-09-04 11:40:12 +00:00
Torbjörn Andersson
aa3687c527 Gave the "monkey" target the same sound flags as the "monkey1" target. At
least I think they refer to the same game, just with differently named data
files. This should fix bug #800378 ("MI1: no adlib with monkey target
(regression)").

Should the same change be made to the "game" (Monkey Island 1, SegaCD
version) target, or is that one too different?

svn-id: r9991
2003-09-04 11:33:46 +00:00
Torbjörn Andersson
9729256b2b Added locking to the music code. I'm not really the right person to do this
but at least it doesn't seem to do any harm.

Disabled the sound FX "garbage collection" in FxServer(). I'm not really
convinced it's necessary at all, and even if it is, doing it from a
separate thread it just begging for trouble. I've modified OpenFx()
slightly to deal with this, but I may still have introduced regressions.

Temporarily disabled the "goto label1" hack, since it seems to be the main
reason for ScummVM crashing if I allow a piece of music to finish on its
own (i.e. when not terminating it prematurely by triggering another piece
of music).

svn-id: r9990
2003-09-04 10:58:55 +00:00
Torbjörn Andersson
a1e336c1cb Added FIXME comment about how we probably need locking for FxServer() and
the functions which access data manipulated by FxServer().

For instance, FxServer() may free bufferFx[i], which sounds potentially
unhealthy to me.

svn-id: r9989
2003-09-03 18:59:02 +00:00
Torbjörn Andersson
94df02c799 Implement the ACTOR_PAN opcode. The only place I know of where it's used is
between between ship-to-ship combats, so I didn't bother yet to store it in
savegames.

svn-id: r9988
2003-09-03 17:00:33 +00:00
Jonathan Gray
a0f6948150 add a bunch of known targets for some of the newer humongous games, maybe we should move the target list out into another file? there are a few more to add after they are known as well...
svn-id: r9987
2003-09-03 10:34:04 +00:00
Jonathan Gray
0fb53e1f47 prepare for larger target names
svn-id: r9986
2003-09-03 10:26:09 +00:00
Jonathan Gray
018d2ee6b1 add some stub cases for later humongous games, queue loading and a decodeParseString case
svn-id: r9985
2003-09-03 08:55:24 +00:00
Torbjörn Andersson
ee68d3d198 Removed fxLooped[], fxCached[] and musCounter[]. They were written to, but
never read.

svn-id: r9984
2003-09-03 06:27:25 +00:00
Paweł Kołodziejski
3fba3b3d4c fixed music fading out. it's "goto" hack.
originaly dsound has 3 seconds buffer fillled with data enought for fading
this hack continue play music for time while fading is going

svn-id: r9983
2003-09-03 06:03:29 +00:00
Paweł Kołodziejski
1fc3c0be23 more cleanup
svn-id: r9982
2003-09-03 05:04:55 +00:00
Paweł Kołodziejski
b62c527fa0 some cleanup code
svn-id: r9981
2003-09-03 04:45:57 +00:00
Paweł Kołodziejski
455d3faf2f fixed interval of fxServer func (why i saw before 1000 miliseconds?), moved init sound data to class sound
svn-id: r9980
2003-09-03 03:57:23 +00:00
Jonathan Gray
e17a451ac5 remove shadow'd var by using variable name from prototype
svn-id: r9979
2003-09-02 22:38:53 +00:00
Jonathan Gray
fee1cc04ea remove unused variable
svn-id: r9978
2003-09-02 22:35:36 +00:00
Paweł Kołodziejski
534fc0f7a2 imuse digi use mixer volume and pan control now
svn-id: r9977
2003-09-02 21:00:08 +00:00
Paweł Kołodziejski
7c4e678a87 moved volume and pan control into flow func
svn-id: r9976
2003-09-02 20:34:22 +00:00
Paweł Kołodziejski
47a2bc6eb6 update vc7 file
svn-id: r9975
2003-09-02 20:32:30 +00:00
Torbjörn Andersson
4b49daf3ff Fixed compiler warning that I introduced earlier.
svn-id: r9974
2003-09-02 16:51:51 +00:00
Torbjörn Andersson
124a84033f Unless I'm gravely mistaken, StreamCompMusic() should always create a new
stream, in which case the warning about the sound handle being 0 is bogus.

svn-id: r9973
2003-09-02 16:20:10 +00:00
Torbjörn Andersson
145f17c4a9 Moved the sound initialisation to the Sword2Sound constructor to avoid
warning messages about uninitialised sound handles.

svn-id: r9972
2003-09-02 15:55:55 +00:00
Torbjörn Andersson
907485c1a2 Another untested endian fix.
svn-id: r9971
2003-09-02 15:11:19 +00:00
Travis Howell
60dd216672 Add missing verbOps cse for loomcd, needs work.
svn-id: r9970
2003-09-02 14:50:58 +00:00
Torbjörn Andersson
730e6b8c38 Use the new per-channel pausing. This allows us to play the music for the
in-game dialogs.

svn-id: r9969
2003-09-02 13:50:45 +00:00
Torbjörn Andersson
f486997822 Added per-channel pausing. Maybe I should have named the pauseChannel()
function simply pause() to be consistent with stop(), but there already is
a pause() function and I don't want to have two functions with the same
name doing different things. (The current pause() function pauses all
channels.)

svn-id: r9968
2003-09-02 13:48:20 +00:00
Torbjörn Andersson
8c61a29c29 Since soundHandleMusic[] is now an array of sound handles instead of
channel indexes, we should use stopHandle() instead of stop() to kill the
music channel.

Am I the only one who finds the distinction between channel indexes and
sound handles confusing at times? :-)

svn-id: r9967
2003-09-02 12:55:20 +00:00
Travis Howell
f90b5f06a5 This changes applies to both version 3 and 4, according to disasm.
svn-id: r9966
2003-09-02 11:24:05 +00:00
Torbjörn Andersson
5270fa2d5a Re-formatted the code to be a bit more in line with the rest of ScummVM,
and made a few (untested) endian-fixes.

svn-id: r9965
2003-09-02 09:55:11 +00:00
Torbjörn Andersson
66cdc7900e Re-formatted the code to be a bit more in line with the rest of ScummVM.
svn-id: r9964
2003-09-02 09:54:42 +00:00
Paweł Kołodziejski
5a6bce590b changed sounds volume to original volume level, and fixed sounds in bass intro
svn-id: r9963
2003-09-02 07:49:40 +00:00
Paweł Kołodziejski
f59a0633d6 fixed if check
svn-id: r9962
2003-09-02 07:18:24 +00:00
Jonathan Gray
1f29e0416c add note about FluidSynth to ALSA section
svn-id: r9961
2003-09-02 06:13:41 +00:00
Travis Howell
3f2ca2b36a Fix from Hibernatus, correct start position for sfx in Amiga maniac/zak.
svn-id: r9960
2003-09-02 03:21:14 +00:00
Travis Howell
7b26efda21 Add sound looping for Amiga zak/maniac
svn-id: r9959
2003-09-01 17:11:09 +00:00
Travis Howell
a2b1e9081c Fix from Hibernatus, indy3 has black shadows
svn-id: r9958
2003-09-01 15:40:16 +00:00
Paweł Kołodziejski
db18d4657c forgot this
svn-id: r9957
2003-09-01 14:02:45 +00:00
Paweł Kołodziejski
743a3fbdaf added sound handle stuff to mixer streams
svn-id: r9956
2003-09-01 13:43:22 +00:00
Chris Apers
e6a0261c7e The channel could be destroyed so changeVolumeAndPan can't access it in that case
svn-id: r9955
2003-09-01 10:12:28 +00:00
Travis Howell
ebf9114f68 Add v1 maniac load/save screen support
Detect save files

svn-id: r9954
2003-09-01 09:08:48 +00:00
Travis Howell
97545e41fb Add missing break
Skip auto save slot.

svn-id: r9953
2003-09-01 07:50:47 +00:00
Torbjörn Andersson
178b0d82df Another attempt at fixing the music1.clu / music2.clu thing.
svn-id: r9952
2003-09-01 06:40:07 +00:00
Paweł Kołodziejski
56ca9f03df possibly fixes for not exist id stream channel
svn-id: r9951
2003-09-01 06:23:04 +00:00