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
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
Travis Howell
da0db02f6e
Fix for simon2mac voices problem, bug #776803
...
svn-id: r9160
2003-07-24 10:20:56 +00:00
Jamieson Christian
17a888b65a
Fix for Bug [775534] 0.5.0 RC SIMON1DOS Random sfx notes during music
...
Corrected a problem with resource size computation for GMF sound
effect resources. Since GMF resources have no size info, we were
computing sizes with the assumption that each GMF appears in its
own file, so the file size becomes the resource size. This is true
for simon1dos music files but not for SFX files. This fix uses the
resource offset pointers at the beginning of SFX files to properly
compute the size of SFX resources.
svn-id: r9155
2003-07-24 04:19:42 +00:00
Travis Howell
0e499b9a80
That last change wasn't quite right
...
svn-id: r9119
2003-07-22 12:16:56 +00:00
Travis Howell
7d52141329
Fix simon1talkie regression
...
svn-id: r9118
2003-07-22 12:09:56 +00:00
Travis Howell
760bfb2245
Rename function, update comments
...
svn-id: r9108
2003-07-21 16:25:16 +00:00
Travis Howell
93cb369da7
Rename variable
...
svn-id: r9106
2003-07-21 09:11:21 +00:00
Travis Howell
2b5cc772d7
Add sfx/voice support for simon1cd32, thanks to olki.
...
Adjust a few debugs
Add hack to allow load/save in simon1cd32 via keyboard
svn-id: r9105
2003-07-21 04:00:04 +00:00
Travis Howell
a4b5891dd1
Use automatic dirty rect code for simon games for now to reduce CPU usage
...
svn-id: r9093
2003-07-20 15:31:47 +00:00
Travis Howell
82f90bb6cf
Fix regression
...
Switch erros to warnings
svn-id: r9092
2003-07-20 15:17:11 +00:00
Travis Howell
2583f4e629
Remove comment
...
svn-id: r9090
2003-07-20 07:27:28 +00:00
Travis Howell
dc25058c3e
Add game specific scaler override to sky
...
Add game specific scaler and full screen override to simon
svn-id: r9067
2003-07-18 15:37:06 +00:00
Travis Howell
f91fb2980a
This is actually needed
...
svn-id: r9049
2003-07-16 12:21:09 +00:00
Travis Howell
60e5e16ae6
Check if voice file exists in simon2
...
svn-id: r9040
2003-07-15 16:51:06 +00:00
Travis Howell
2b7227679a
Use debug output instead of warnings for simon
...
Fix debug output in sky
svn-id: r9039
2003-07-15 16:40:24 +00:00
Travis Howell
d0915c690c
Remove unneeded warning
...
svn-id: r9038
2003-07-15 15:26:17 +00:00
Travis Howell
eddf075495
Remove warning in simon
...
Add INDY3EGA Amiga - experimental support for sound effects, patch #771355
svn-id: r9033
2003-07-15 07:29:23 +00:00
Jamieson Christian
eedeffac6a
Fixed behavior of "m" key under simon1dos.
...
The "m" key was turning off both music
AND MIDI sound effects. It now turns off
only the music.
svn-id: r9014
2003-07-14 12:15:17 +00:00
Jamieson Christian
dc3e4ce46b
Fixed error that resulted in bad script tracking
...
when creating sprites during a savegame load
after having been at certain locations.
(If that sounds convoluted, it's because I don't
know why I fixed what I did, only that the code
we had was not quite constructed properly from
assembler references.)
svn-id: r9013
2003-07-14 12:00:20 +00:00
Jamieson Christian
4ae380102a
Fix for Bug [770838] SIMON1DOS: Fatal crashes with French version
...
Fix variable underflow for large subtitle strings with no
discernable whitespace. This fixes crashes for French subtitles
that do, in fact, have whitespace but perhaps not using the
same ASCII character that we scan for. Anyway, the text will
display, albeit with an extra blank line, and ScummVM no longer
blows up.
svn-id: r9009
2003-07-14 10:02:37 +00:00
Jamieson Christian
40eac8b182
Fixed typo. While I agree that this error should have
...
been caught before committing (compiler didn't detect
need to do incremental build, sorry), I think if something
this trivial is going to get such a reaction, I have to
agree with Fingolfin that a release or RC branch is
advisable regardless of how slow one predicts the CVS
traffic will be.
svn-id: r9005
2003-07-14 09:02:12 +00:00
James Brown
2980a78dff
We ARE in a cvs freeze, PLEASE at least test if your code compiles before commiting...
...
Jamieson, this isn't even a valid line of C! @toad Jamieson630
svn-id: r9004
2003-07-14 08:48:38 +00:00
Jamieson Christian
74d3d914a9
Feature [770161] SIMON: Remap instruments to GM
...
Apparently Simon 1 (all versions) uses MT32 instruments,
so now we map them to GM *unless* the --native-mt32
option was specified.
svn-id: r9001
2003-07-14 08:29:17 +00:00
Max Horn
963ecad362
debug/warning/error all automatically output a newline
...
svn-id: r8991
2003-07-13 16:22:17 +00:00
Jamieson Christian
39a088229a
Fix for Bug [768940] SIMON: Music in Swamp shouldn't loop
...
Fixed problem with how loop control was being handled
in the Simon 2 music queueing logic.
svn-id: r8968
2003-07-13 06:29:49 +00:00
Max Horn
d098334fe6
updated code to use type MutexRef; added class StackLock (from sdl backend, now in util.*)
...
svn-id: r8777
2003-07-05 15:19:11 +00:00