Jamieson Christian
e1bc6493d8
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible
...
list of music types supported. This was done because now
PC speaker support must be treated separately, along with
Adlib and native (GM/MT32) support.
This fixes a problem with games that don't support PC speaker
(including V5 games that don't parse SPK resources yet)
being run with -epcspk or -epcjr. Those games now properly
switch to -enull so that music resources still get parsed
and music/script synchronization mechanisms don't break.
svn-id: r9703
2003-08-15 10:19:24 +00:00
Jamieson Christian
5a1b0ac24a
More music volume management fixes
...
svn-id: r9636
2003-08-11 05:25:33 +00:00
Jamieson Christian
45f3db95fd
Fix for Bug [777589] SIMON1: Sound volume strangeness
...
Fixed redundant, cumulative adjustments of _masterVolume
on the individual channel volumes. This fixes problems
with individual instruments changing volume by too much,
or dropping out altogether, when changing the master
music volume.
svn-id: r9635
2003-08-11 04:33:17 +00:00
Marcus Comstedt
8f88764ef0
stdafx.h needs to be included before scummsys.h because of the #define of free.
...
svn-id: r9628
2003-08-10 20:57:41 +00:00
Marcus Comstedt
2ed0eee711
Replaced use of File with use of SaveFileManager where appropriate.
...
svn-id: r9627
2003-08-10 20:50:50 +00:00
Travis Howell
9d09512765
Add missing code for f10 key, thanks to Jamieson
...
Stops multiple flashing star occuring on one character/object
svn-id: r9625
2003-08-10 15:58:38 +00:00
Travis Howell
5d972a657b
Fix for f10 key in simon1
...
svn-id: r9624
2003-08-10 15:49:06 +00:00
Jamieson Christian
154e872d5a
Added generic send() option to MidiChannel.
...
This circumvents problems doing generic send()
calls to MidiDrivers that support more than
16 MIDI channels (i.e. Adlib). Because of the
way it interacts with MidiDriver, Simon could
have run into a problem if it tried to
allocate more than 15 Adlib music channels
(though this would only happen in very, VERY
rare circumstances).
Also fixed a problem with the channel
numbering scheme used by MidiDriver_Adlib,
in particular the percussion channel number.
svn-id: r9604
2003-08-08 11:54:24 +00:00
Jamieson Christian
0ca58111c6
More Simon shutdown cleanup
...
svn-id: r9602
2003-08-08 09:48:42 +00:00
Travis Howell
47d98f94db
Use shutdown() when quiting via ctrl z
...
svn-id: r9601
2003-08-08 09:42:38 +00:00
Jamieson Christian
456124d109
Fixed hang from double-lock of mutex
...
svn-id: r9600
2003-08-08 09:36:37 +00:00
Jamieson Christian
9b297a39b1
Close music engine on shutdown
...
svn-id: r9599
2003-08-08 09:27:52 +00:00
Travis Howell
e4e9538038
Add GF_INDY3 feature flag for indy3 games to reduce checks
...
Remove GF_ADLIB_DEFAULT since it is no longer used
svn-id: r9546
2003-08-06 09:10:19 +00:00
Travis Howell
43a1d35064
Reverted too much
...
Add note about missing code in simon
svn-id: r9531
2003-08-06 05:47:49 +00:00
Max Horn
77d3e9333b
must create adlib driver *after* calling _mixer->bindToSystem
...
svn-id: r9528
2003-08-06 00:19:20 +00:00
Max Horn
75db41750e
getting rid of g_mixer; removing lots of whitespace
...
svn-id: r9527
2003-08-05 23:58:24 +00:00
Travis Howell
2e6865b8a3
oops
...
svn-id: r9508
2003-08-05 17:42:23 +00:00
Travis Howell
0d2a3e5e7e
F10 key works in simon1, although it highlights exits
...
svn-id: r9506
2003-08-05 17:39:06 +00:00
Travis Howell
486c1c77e1
Remove line
...
svn-id: r9452
2003-08-04 06:01:08 +00:00
Travis Howell
b630882683
Add Hebrew support for spoken text
...
Thanks to Jamieson
svn-id: r9444
2003-08-03 19:28:39 +00:00
Travis Howell
8762b47a11
Make code match
...
svn-id: r9405
2003-08-02 11:04:29 +00:00
Travis Howell
03f6ec8a8a
Always check for null string
...
svn-id: r9404
2003-08-02 10:48:30 +00:00
Travis Howell
ec676d1581
My last commit caused regression
...
svn-id: r9402
2003-08-02 10:42:54 +00:00
Travis Howell
40c3f25cd7
Add combined speech/subtitles support for simon2 hebrew
...
svn-id: r9401
2003-08-02 10:15:07 +00:00
Travis Howell
29247636f6
Add combined speech/subtitles support for simon2 hebrew
...
svn-id: r9400
2003-08-02 10:09:05 +00:00
Travis Howell
0b2bd31010
Hebrew support for load/save dialog
...
svn-id: r9398
2003-08-02 07:10:30 +00:00
Travis Howell
471bc5ceb5
Improved hebrew support, thanks to Jamieson
...
svn-id: r9397
2003-08-02 07:00:58 +00:00
Max Horn
103112dd3d
removed OSystem::set_mouse_pos (I hope I didn't break any backends, but if I did it should be trivial to get them working again)
...
svn-id: r9391
2003-08-02 00:36:38 +00:00
Max Horn
0df319e952
#include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level)
...
svn-id: r9359
2003-08-01 12:21:04 +00:00
Travis Howell
fc5d38ec50
Small cleanup
...
svn-id: r9316
2003-07-31 01:59:31 +00:00
Travis Howell
e739a9644c
Fix Golum Ring causes graphic glitches, bug #777966
...
svn-id: r9294
2003-07-30 16:25:05 +00:00
Travis Howell
2ddd3a9895
typo
...
svn-id: r9293
2003-07-30 11:17:51 +00:00
Travis Howell
00bcd731f5
Add/remove/update simon comments
...
svn-id: r9292
2003-07-30 11:16:09 +00:00
Travis Howell
f503013b5a
Small cleanup
...
svn-id: r9290
2003-07-30 10:05:09 +00:00
Jamieson Christian
269757dabc
vc_10_no_depack_swap implementation
...
svn-id: r9289
2003-07-30 09:36:48 +00:00
Travis Howell
7fbd161cad
Fix unit'd array and variable in simon
...
svn-id: r9285
2003-07-30 01:43:28 +00:00
Torbjörn Andersson
f4f63d71db
Partial fix for bug #779013 . It no longer crashes, but the config file
...
setting still overrides the command-line option.
svn-id: r9283
2003-07-29 21:03:25 +00:00
Max Horn
6b470390f7
cleanup
...
svn-id: r9281
2003-07-29 12:39:41 +00:00
Travis Howell
bbbebd9d14
Some basic suport for reversed text for hebrew version.
...
svn-id: r9278
2003-07-29 06:12:52 +00:00
Marcus Comstedt
4dfd76fb9d
<memory.h> is not a standard header file. (Merge from branch-0-5-0.)
...
svn-id: r9255
2003-07-28 17:14:41 +00:00
Max Horn
a57263fa0a
unification
...
svn-id: r9242
2003-07-28 11:48:07 +00:00
Travis Howell
b8ce60ea18
Count amount of save files available so load/save dialog works correctly.
...
svn-id: r9196
2003-07-27 12:05:08 +00:00
Travis Howell
9937e18ba5
Surprised this has not caused major problems
...
svn-id: r9188
2003-07-25 08:49:54 +00:00
Travis Howell
9bb773c67d
Use correct frame rate value from disasm, fixes minor timing issue in simon 2 in
...
troduction.
Correct default _lock_counter value
svn-id: r9186
2003-07-25 06:55:05 +00:00
Travis Howell
8146de7693
ambient sfx works fine again
...
svn-id: r9178
2003-07-24 17:49:03 +00:00
Travis Howell
be7597a8c9
Should be right now
...
svn-id: r9174
2003-07-24 16:54:40 +00:00
Travis Howell
316162fe19
Ooops
...
svn-id: r9171
2003-07-24 15:15:35 +00:00
Travis Howell
635fea9b17
Simon games shold only play one voice at a time.
...
Fixes many voice overlaps
Fixes subtitles been ot of sync with voice, with simon 1 versions that had combi
ned speech/subtitles.
svn-id: r9167
2003-07-24 14:21:56 +00:00
Travis Howell
55c71f65c0
Another leak
...
svn-id: r9165
2003-07-24 12:32:56 +00:00
Travis Howell
f930abe568
Check before releasing memory
...
svn-id: r9163
2003-07-24 12:05:06 +00:00
