Commit Graph

343 Commits

Author SHA1 Message Date
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
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
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
9b297a39b1 Close music engine on shutdown
svn-id: r9599
2003-08-08 09:27:52 +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
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
Travis Howell
fc5d38ec50 Small cleanup
svn-id: r9316
2003-07-31 01:59:31 +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
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
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
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
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
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
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
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
2b580871c2 delete _sound when SimonState is destroyed; fix leak & enian bug in playSting (but somebody please test that, I don't have simon1dos)
svn-id: r8582
2003-06-21 15:53:27 +00:00
Max Horn
ceb1005f6c some more memory inits; cleanup
svn-id: r8581
2003-06-21 15:42:20 +00:00
Max Horn
0cb2053d9d init some member vars previously not inited
svn-id: r8579
2003-06-21 15:32:35 +00:00
Travis Howell
81eeff479d Change GF_AMIGAS back to GF_AMIGA
svn-id: r8510
2003-06-15 14:07:53 +00:00
Max Horn
e6455a9dd2 cleanup
svn-id: r8509
2003-06-15 13:07:06 +00:00
Oliver Kiehl
4d5db88535 cleanup
svn-id: r8502
2003-06-15 09:55:10 +00:00