Travis Howell
b51d271cc6
Fix regression
...
svn-id: r12025
2003-12-30 00:37:00 +00:00
Max Horn
436b5c5f7d
Use VOC reader from voc.h
...
svn-id: r11963
2003-12-27 14:11:03 +00:00
Max Horn
859a9c0129
o Added SoundMixer::isReady()
...
o Removed SoundMixer::bindToSystem()
o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady()
svn-id: r11893
2003-12-24 17:42:22 +00:00
Travis Howell
3cd69b641f
Should apply to all Simon1 versions
...
svn-id: r11882
2003-12-24 00:26:52 +00:00
Max Horn
e9269257f3
turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them
...
svn-id: r11881
2003-12-24 00:25:18 +00:00
Travis Howell
10579f2e75
Add delay to help reduce cpu usage in some sections.
...
svn-id: r11875
2003-12-23 10:47:36 +00:00
Travis Howell
94750df7ee
Ooops
...
svn-id: r11874
2003-12-23 10:08:54 +00:00
Travis Howell
2ab86ff62a
Fix inventory flashing when using F10 in Simon1 after conversation.
...
svn-id: r11873
2003-12-23 10:00:51 +00:00
Travis Howell
0727697db0
Add correct value from simon2dos disasm.
...
Last value was guess for smooth scrolling.
svn-id: r11872
2003-12-23 09:08:11 +00:00
Travis Howell
9601273824
Ooops
...
svn-id: r11871
2003-12-23 09:03:29 +00:00
Travis Howell
35be4ef554
Add var to track current subroutine been used.
...
Add work around to display one section of Simon the Sorcerer 1 introduction in lower half of screen.
svn-id: r11870
2003-12-23 08:59:30 +00:00
Travis Howell
f681946192
Add comment
...
svn-id: r11869
2003-12-23 06:55:26 +00:00
Travis Howell
10bdda505c
simon2dos/talkie used different expire_vga_timers() code.
...
Solves several bugs.
Using simon1 timer_proc() seciton as work out for speed issue at the moment.
svn-id: r11867
2003-12-23 06:35:17 +00:00
Travis Howell
d668694d66
Switch back to older method (Used in Hebrew version) of combined speech and subtitles for Simon2.
...
svn-id: r11847
2003-12-22 11:08:35 +00:00
Max Horn
dfa5e09aec
cleanup; fix endian bug which caused the dreaded Simon1 hang on MacOS (_palette_color_count was treated as a 32 bit int when it is only 16 bit -> once again proves that one should be really really carefully with pointer cast hacks!)
...
svn-id: r11835
2003-12-21 18:50:44 +00:00
Travis Howell
fdbceaf5e3
Add music_mute config option to Simon 1/2
...
svn-id: r11825
2003-12-21 16:55:50 +00:00
Travis Howell
522938f7fa
Add sfx_mute to simon
...
svn-id: r11824
2003-12-21 16:51:31 +00:00
Max Horn
5eef5d4e15
add purely experimental & untested Ogg Vorbis support to Simon
...
svn-id: r11816
2003-12-21 16:01:36 +00:00
Marcus Comstedt
4fa0d93dfb
Use of stat() is not portable...
...
svn-id: r11813
2003-12-21 15:53:38 +00:00
Max Horn
f19f73eb50
Make it possible for game detection functions to detect language/platform (not yet done by any detector, but will come with the MD5 detection code)
...
svn-id: r11811
2003-12-21 15:29:52 +00:00
Travis Howell
7b498fe7db
Switch speech config option to speech_mute config options, for Simon 1/2 games. In order to match other engines.
...
svn-id: r11810
2003-12-21 14:42:19 +00:00
Travis Howell
eb8af1c05f
Revert for now, breaks VC.
...
svn-id: r11807
2003-12-21 09:01:58 +00:00
Travis Howell
a7201f0dac
Might as well merge, not need for larger sizes.
...
svn-id: r11804
2003-12-21 06:36:29 +00:00
Max Horn
dafca64f36
don't use sound/mixer index, rather use the sound handle!
...
svn-id: r11794
2003-12-21 00:05:00 +00:00
Travis Howell
fb61c84042
Enable more debugging output
...
svn-id: r11793
2003-12-21 00:03:15 +00:00
Travis Howell
4374894733
Correction
...
svn-id: r11779
2003-12-20 10:21:32 +00:00
Travis Howell
aceafcbb48
Add correction solution for missing song in dwarf mines of Simon1.
...
svn-id: r11774
2003-12-20 09:05:25 +00:00
Travis Howell
50c2dc9b25
Correction
...
svn-id: r11773
2003-12-20 08:23:31 +00:00
Travis Howell
ff55c1ae4b
Correction
...
svn-id: r11772
2003-12-20 07:59:42 +00:00
Travis Howell
6effdfac9f
Enable vgascript dump option.
...
svn-id: r11771
2003-12-20 06:39:24 +00:00
Travis Howell
fb89d1a32e
Revert bug work around, still can't detect conversation will enough yet.
...
svn-id: r11770
2003-12-20 06:00:55 +00:00
Travis Howell
19fe4c947a
Simpler check
...
svn-id: r11769
2003-12-20 04:34:24 +00:00
Travis Howell
20a6ad7572
*** empty log message ***
...
svn-id: r11768
2003-12-20 04:29:17 +00:00
Travis Howell
cc4716c831
Remove warning.
...
svn-id: r11767
2003-12-20 04:25:01 +00:00
Travis Howell
158755382b
Fix iventory arrowsin some versions of Simon1.
...
svn-id: r11765
2003-12-20 04:20:22 +00:00
Travis Howell
ffc068734d
Safetly check
...
svn-id: r11739
2003-12-18 11:16:10 +00:00
Travis Howell
c10eace9e3
Add speech config option, to allow subtitles only in Simon2 again.
...
svn-id: r11738
2003-12-18 11:04:02 +00:00
Travis Howell
77bf6491cc
C&P typo.
...
svn-id: r11737
2003-12-18 10:48:48 +00:00
Travis Howell
1f4e54f930
Make fade a config optiom
...
Make sure non-English/German versions of simon1talkie start with subtitles enabled.
svn-id: r11736
2003-12-18 10:47:12 +00:00
Travis Howell
22c865791a
Remove slow motion option.
...
Add slow_down option for config file instead for now.
svn-id: r11735
2003-12-18 09:36:17 +00:00
Travis Howell
d0da61f8aa
Revert fade change
...
svn-id: r11734
2003-12-18 09:10:47 +00:00
Travis Howell
592822fbe5
Don't use bug work around on simon1dos, since copy protection screen causes odd effects.
...
svn-id: r11733
2003-12-18 09:04:13 +00:00
Travis Howell
af6c68faf7
Remove old hack
...
svn-id: r11671
2003-12-16 05:08:26 +00:00
Travis Howell
0b61a4c3a8
Add some additional simon1 amiga code from tsuteiuQ, not working right yet.
...
svn-id: r11670
2003-12-16 05:04:39 +00:00
Chris Apers
6a9972c5f5
No stat.h on PalmOS
...
svn-id: r11658
2003-12-15 15:17:06 +00:00
Travis Howell
c976e7fda0
quick load/save isn't possible for simon1dmeo
...
svn-id: r11614
2003-12-13 13:46:58 +00:00
Travis Howell
73f3c3bdd4
Remove warning.
...
svn-id: r11609
2003-12-13 01:54:53 +00:00
Travis Howell
3d04b69cbd
Don't switch voice file in simon2mac unless needed.
...
svn-id: r11608
2003-12-13 01:54:17 +00:00
Travis Howell
c7a6458849
Thereis no save slot 0 in simon games.
...
svn-id: r11607
2003-12-13 01:26:40 +00:00
Travis Howell
1ac989586d
Add slow motion option
...
svn-id: r11604
2003-12-13 01:18:31 +00:00
Max Horn
35b62c294d
removed GameSettings::detectname and GameSettings::midi; renamed GameSettings::gameName to name; added temporary experimental MD5 hack
...
svn-id: r11603
2003-12-13 00:20:01 +00:00
Max Horn
0b22651494
avoid accessing detector->_game.midi
...
svn-id: r11598
2003-12-12 15:28:44 +00:00
Travis Howell
dbc5d8c3ee
Add work around for bug in original simon1.
...
svn-id: r11592
2003-12-12 03:19:39 +00:00
Travis Howell
48440c3697
Prevent quick load/save during copy protection or conversation.
...
svn-id: r11591
2003-12-12 01:31:02 +00:00
Travis Howell
c37dd7a192
Don't update screen manually, as original didn't.
...
svn-id: r11590
2003-12-12 00:05:28 +00:00
Travis Howell
232fe2889a
Remove comment------
...
svn-id: r11580
2003-12-11 11:07:43 +00:00
Travis Howell
507a7057c1
Ooops
...
svn-id: r11578
2003-12-11 10:05:46 +00:00
Max Horn
3c9c652f13
fix compilation on non-win32 systems
...
svn-id: r11576
2003-12-11 09:56:21 +00:00
Travis Howell
898d5f2647
No need for buffers that large.
...
svn-id: r11575
2003-12-11 09:29:56 +00:00
Travis Howell
bc00922990
Change another debug define to key
...
Dump options should now work on non-win32
svn-id: r11574
2003-12-11 09:14:10 +00:00
Travis Howell
1e90d540eb
Correct filename
...
svn-id: r11568
2003-12-11 05:20:01 +00:00
Travis Howell
8c1cf30b6b
Add About option
...
svn-id: r11567
2003-12-11 04:41:42 +00:00
Travis Howell
324da16de2
Add dialog for quick load/save in simon1/2.
...
svn-id: r11564
2003-12-11 03:50:25 +00:00
Travis Howell
46f00d079c
Remove comment
...
svn-id: r11563
2003-12-11 03:23:07 +00:00
Travis Howell
5154790733
Fix and enabble quick load/save keys in simon 1/2.
...
svn-id: r11562
2003-12-11 02:43:28 +00:00
Travis Howell
c3f23cbd48
Oops
...
svn-id: r11561
2003-12-11 02:13:42 +00:00
Travis Howell
44eadc398c
Add some WIP quick load/save keys code for simon 1/2. currently disabled.
...
svn-id: r11560
2003-12-11 02:09:18 +00:00
Travis Howell
ac237909ff
Pause music and background sfx. too
...
svn-id: r11546
2003-12-10 01:05:21 +00:00
Travis Howell
2347409dd1
Add puase option for simon games.
...
svn-id: r11545
2003-12-10 00:54:53 +00:00
Jamieson Christian
e6d176bc67
Added support for Simon 2's native MT-32 music tracks
...
svn-id: r11540
2003-12-09 10:19:27 +00:00
Travis Howell
e600b3081f
This checks should be simon1win only, just to be on safe side.
...
svn-id: r11506
2003-12-06 04:18:48 +00:00
Travis Howell
0b0580e242
Cleanup
...
svn-id: r11505
2003-12-06 02:08:51 +00:00
Travis Howell
1799a7f307
simon1cd32 regression
...
svn-id: r11480
2003-12-03 05:52:21 +00:00
Chris Apers
cf682ed8f7
Added memory auto-configuration on PalmOS for better speed and compatibility
...
svn-id: r11472
2003-12-02 11:17:21 +00:00
Travis Howell
d77b11aef6
Add back some missing code
...
svn-id: r11462
2003-12-02 08:43:54 +00:00
Travis Howell
3cb4a1180e
Cleanup
...
svn-id: r11461
2003-12-02 08:28:54 +00:00
Travis Howell
dad0d55042
Ooops
...
svn-id: r11460
2003-12-02 08:26:32 +00:00
Travis Howell
c793e4c9df
Switch nosubtitles option to subtitles, to match others and help with Simon2 issue.
...
svn-id: r11458
2003-12-02 08:09:14 +00:00
Travis Howell
13db38223c
Cleanup
...
svn-id: r11456
2003-12-02 06:23:05 +00:00
Travis Howell
bde45d4335
This screen update causes delay and doesn't seem to be required.
...
Remove old debug message
svn-id: r11455
2003-12-02 05:53:32 +00:00
Travis Howell
528fd63a07
Only used in simon1win
...
svn-id: r11454
2003-12-02 05:12:49 +00:00
Travis Howell
53b2f75215
Revert last change, ScummVM handles it better than original.
...
svn-id: r11448
2003-12-01 12:18:57 +00:00
Travis Howell
b398363060
Simon2 background sfx can be disabled in scripts
...
svn-id: r11446
2003-12-01 10:23:51 +00:00
Max Horn
72eb8ccb89
Patch #847464 : Remove spurious semicolons
...
svn-id: r11445
2003-12-01 09:58:55 +00:00
Travis Howell
81a5d0e1f3
Add correct values for F1 - F3 text speed keys in simon1
...
svn-id: r11444
2003-12-01 09:53:03 +00:00
Travis Howell
a008022b30
Missed some
...
svn-id: r11442
2003-12-01 05:47:57 +00:00
Travis Howell
82a6f97047
cleanup
...
svn-id: r11441
2003-12-01 05:22:04 +00:00
Travis Howell
28f9c34f8c
Might as well combine these two.
...
svn-id: r11440
2003-12-01 00:54:50 +00:00
Max Horn
242efda7fb
cleanup
...
svn-id: r11439
2003-12-01 00:45:16 +00:00
Max Horn
d98479ee5d
cleanup; fix some memory leaks; more memory leaks remaining
...
svn-id: r11419
2003-11-29 11:56:24 +00:00
Travis Howell
d636ee7855
var value were different in simon1dos
...
svn-id: r11418
2003-11-29 10:12:47 +00:00
Chris Apers
651beb46ac
Can't do this like that
...
svn-id: r11409
2003-11-28 10:11:56 +00:00
Chris Apers
7d5551e507
Don't overflow the stack
...
svn-id: r11408
2003-11-28 10:11:04 +00:00
Max Horn
3a355e0763
fix compilation
...
svn-id: r11271
2003-11-13 00:00:49 +00:00
Chris Apers
de1e3baf41
Preliminary support of Simon games on PalmOS
...
svn-id: r11269
2003-11-12 16:00:11 +00:00
Max Horn
e34f2b8b33
cut down on unnecessary GameDetector references
...
svn-id: r11239
2003-11-10 01:04:12 +00:00
Paweł Kołodziejski
7d6c5bc1da
cleanup whitespaces
...
svn-id: r11214
2003-11-08 20:54:31 +00:00
Travis Howell
28823a2b2a
Spacing
...
svn-id: r11009
2003-10-30 01:09:41 +00:00
Travis Howell
a1e794d920
Add option to switch between subtitles only and combined speech/subtitles in Simon 2.
...
svn-id: r11008
2003-10-30 01:05:08 +00:00
Max Horn
53db0a8a07
cleanup: removed version/id from GameSettings
...
svn-id: r10995
2003-10-28 17:07:25 +00:00
Travis Howell
3f6f1e3311
Ooops
...
svn-id: r10973
2003-10-26 05:48:54 +00:00
Travis Howell
c7e723ceb4
Add combined speech and subtitles support for simon2.
...
svn-id: r10972
2003-10-26 05:31:36 +00:00
Travis Howell
1b38419b42
Add more debug.
...
svn-id: r10971
2003-10-26 04:37:11 +00:00
Travis Howell
b16d51a257
Rename function.
...
svn-id: r10970
2003-10-26 04:35:35 +00:00
Travis Howell
b051506bf1
Ooops
...
svn-id: r10969
2003-10-26 04:07:44 +00:00
Travis Howell
394bb952c5
Update issues
...
svn-id: r10968
2003-10-26 04:03:51 +00:00
Travis Howell
0600e4e0f4
Fix simon1dos freezes
...
svn-id: r10966
2003-10-26 03:20:13 +00:00
Travis Howell
4e78623eb2
VC warnings
...
svn-id: r10953
2003-10-24 02:26:41 +00:00
Travis Howell
3ccd6704bd
Don't attempt to play sound in simon2mac if file doesn't exist.
...
Add fixme for simon2mac, freeing voice at this point which causes crashes.
svn-id: r10943
2003-10-23 04:49:04 +00:00
Oliver Kiehl
016c90911e
fix gcc 3.3.2 warning
...
svn-id: r10942
2003-10-22 11:15:09 +00:00
Travis Howell
48b9e18086
Remove comments
...
svn-id: r10941
2003-10-22 09:20:47 +00:00
Travis Howell
3d229f6c8c
Add load/save game failture messages from original games.
...
svn-id: r10940
2003-10-22 09:17:31 +00:00
Travis Howell
b582881471
Missed one
...
svn-id: r10930
2003-10-21 11:45:46 +00:00
Travis Howell
c3deeb3daf
Correctly reanem var this time.
...
svn-id: r10929
2003-10-21 11:41:33 +00:00
Travis Howell
e4813cfab5
Rename a few vars
...
svn-id: r10928
2003-10-21 10:34:56 +00:00
Travis Howell
54fc5335c0
Rename a few vars
...
svn-id: r10927
2003-10-21 10:14:42 +00:00
Travis Howell
87fb27d02c
Rename function
...
svn-id: r10926
2003-10-21 09:43:37 +00:00
Jonathan Gray
a1f9ed293c
fix shadow'd variable, the single letter variable names in the simon code are rather scary....
...
svn-id: r10925
2003-10-21 09:33:49 +00:00
Travis Howell
ed0c30fcbf
Fix text spacing when backspace key is used when entering save game name in Hebrew version. Need to pass along last character printed, so correct spacing can be used.
...
svn-id: r10922
2003-10-21 06:35:19 +00:00
Travis Howell
01c0bd5eb7
Stop garbage been left behind with backspace key when entering save game name, in non-English versions.
...
svn-id: r10921
2003-10-21 05:48:32 +00:00
Max Horn
33f2fbff08
We proudly present the latest installment of our hit series 'Untangle the mess': 'Help! Space Invaders refactored the music detector'... in other news, I obviously need to sleep now
...
svn-id: r10883
2003-10-18 00:22:46 +00:00
Max Horn
0694eed273
moved game detection code out to the plugins
...
svn-id: r10882
2003-10-17 23:16:53 +00:00
Max Horn
a70460833e
moved platform/language constants to common/util.*
...
svn-id: r10862
2003-10-17 15:35:46 +00:00
Travis Howell
bc072912b6
Fix a few defaults vars.
...
svn-id: r10824
2003-10-16 10:10:48 +00:00
Travis Howell
27fc807688
Minor cleanup
...
svn-id: r10823
2003-10-16 09:41:35 +00:00
Max Horn
ebd314a9ec
fix debug mode 0
...
svn-id: r10791
2003-10-14 07:52:34 +00:00
Max Horn
36fd7ec445
some renaming for more consistent terminology (although we might want to reevaluate this): 'target' is what is in your config file; 'game' is what a frontend provide. E.g. the scumm frontend provides the game 'monkeyvga', and my config file has target 'monkeyvga-ger' configured to use that game
...
svn-id: r10766
2003-10-12 18:40:12 +00:00
Jamieson Christian
c38ca923d8
Fix for Bug [821514] SIMON: No Adlib volume for percussion
...
Transmit volume with each percussion event. (Necessary
because music and SFX tracks may share the percussion
channel.) This is the same approach used in iMuse.
svn-id: r10753
2003-10-12 14:31:21 +00:00
Max Horn
5301edc383
some cleanup
...
svn-id: r10720
2003-10-10 13:55:08 +00:00
Max Horn
d177364715
new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS
...
svn-id: r10687
2003-10-08 21:59:23 +00:00
Travis Howell
802a2a1310
Fix display of verb name text when verb is selected in Simon the Sorcerer 1 and enable for all versions of the game.
...
svn-id: r10677
2003-10-08 07:38:48 +00:00
Max Horn
b4e5d97994
factor out common gfx_mode/fullscreen setup code from the game engines into the main code (maybe putting this into the Engine constructor would be better, though?)
...
svn-id: r10611
2003-10-05 14:37:16 +00:00
Max Horn
d4734bd4f2
use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code
...
svn-id: r10592
2003-10-04 11:50:21 +00:00
Max Horn
ad293a5ab8
cleanup / doxygenification
...
svn-id: r10578
2003-10-03 23:34:06 +00:00
Max Horn
a4b72c9d6e
Simon namespace
...
svn-id: r10574
2003-10-03 19:42:27 +00:00
Jamieson Christian
91dc619adf
Fix for Bug [812995] MT-32: wrong channel mapping
...
Implemented channel mask for Simon 1/2
when using --native-mt32.
svn-id: r10525
2003-10-01 17:34:46 +00:00
Jamieson Christian
6a4c977a48
Added decruncher for Simon 1 disk version files.
...
Also thanks to Stuart Caie for the C conversion
of the decruncher algorithm.
svn-id: r10476
2003-09-29 04:15:24 +00:00
Jamieson Christian
a48c8ff4c1
First-revision Amiga icon decompressor.
...
Thanks for Stuart Caie for the C conversion
that was adapted for this addition. On the
Web at http://www.kyz.uklinux.net/
svn-id: r10475
2003-09-29 02:59:47 +00:00
Travis Howell
c03b99eab6
Small correction for simon1/2 Hebrew
...
svn-id: r10411
2003-09-26 05:34:52 +00:00
Travis Howell
ab66db7cd0
Small cleanup to reduce amount of game id checks.
...
svn-id: r10402
2003-09-25 04:32:28 +00:00
Travis Howell
07c3c2dac6
Small cleanup to reduce amount of game id checks.
...
svn-id: r10401
2003-09-25 04:23:07 +00:00
Torbjörn Andersson
570e60a487
Whitespace changes
...
svn-id: r10390
2003-09-24 06:33:59 +00:00
Travis Howell
3854ce8f3d
Add Acorn version of Simon the Sorcerer 1 Talkie
...
svn-id: r10389
2003-09-24 06:19:30 +00:00
Oliver Kiehl
16048e9c14
fix bug pointed out by Merlin0fCha0s
...
svn-id: r10343
2003-09-20 22:26:10 +00:00
Max Horn
f539bd72e7
fixed AMD64 warning
...
svn-id: r10341
2003-09-20 20:01:32 +00:00
Max Horn
6a4663824e
added initial support for building our 4 adventure engines as loadable modules; right now only work on OS X; once we add more build rules, other systems with dlopen() should work, too (e.g. Linux); Windows support may come later. This is still very much WIP
...
svn-id: r10304
2003-09-18 18:23:53 +00:00
Max Horn
a15fdcea21
plugin work: right now, only with build rules for OS X. Once I can get it to work here, I'll add more build rules. Work in progress, a lot ain't work, but the plugin stuff is disabled by default, so no harm should arise
...
svn-id: r10292
2003-09-18 13:03:56 +00:00
Max Horn
be9d4066e1
moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)
...
svn-id: r10287
2003-09-18 02:07:18 +00:00
Max Horn
c1a678afeb
new module 'base'; moved gameDetector.*, main.cpp and base/plugins.* there (this removes the need for an ugly hack in the build system, and is also conceptionally cleaner)
...
svn-id: r10282
2003-09-17 22:41:01 +00:00
Max Horn
231cb16b5b
some tweaks to the build system (work toward plugin support)
...
svn-id: r10279
2003-09-17 21:53:13 +00:00
Max Horn
07a9646997
moved declaration of error/warning/debug from engine.h to util.h
...
svn-id: r10152
2003-09-10 12:31:20 +00:00
Max Horn
f23a34c9e5
renamed VersionSettings -> TargetSettings and also renamed some of its members; added GameDetector::findTarget; made launcher use that new method; some initial preparations for Plugin code
...
svn-id: r10092
2003-09-08 15:38:34 +00:00
Max Horn
7342163c7e
make use of voc.h; some cleanup
...
svn-id: r10073
2003-09-07 20:30:02 +00:00
Max Horn
0be0196013
removed pauseMixer method from mixer, and renamed stop to stopChannel
...
svn-id: r10042
2003-09-06 10:47:30 +00:00
Max Horn
06b6ff9a44
added default volume/pan values
...
svn-id: r10019
2003-09-05 21:06:32 +00:00
Paweł Kołodziejski
7bc63a0ce3
fixes for uninitialized pan and volume
...
svn-id: r9998
2003-09-05 06:22:10 +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
2533b23a60
added mixer features: volume and pan control per channel
...
svn-id: r9944
2003-08-31 20:26:21 +00:00
Torbjörn Andersson
dfe5d067bb
Reverted previous change since the mixer change was reverted.
...
svn-id: r9929
2003-08-30 20:35:07 +00:00
Torbjörn Andersson
e7bebcf7aa
Fixed Simon 2 intro regression (and possibly others as well) caused by
...
recent mixer change.
svn-id: r9926
2003-08-30 20:14:30 +00:00
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
