ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,504 Commits 45 Branches 139 Tags
28e6e05025a7ff4aba54e0d4bc1bcac4df875a03
Commit Graph
472 Commits
Author SHA1 Message Date
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
Max Horn 6ca8d634fd only declare class MP3Sound if USE_MAD is #defined 
svn-id: r8644
 2003-06-24 21:52:52 +00:00
Max Horn 7281ac6907 undo this change again - proper fix would be to correct the MP3 playback code 
svn-id: r8593
 2003-06-21 22:04:20 +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 3de24123e7 fix some memory leaks 
svn-id: r8580
 2003-06-21 15:36:19 +00:00
Max Horn 0cb2053d9d init some member vars previously not inited 
svn-id: r8579
 2003-06-21 15:32:35 +00:00
Max Horn ece6f28fd7 fix (?) for an invalid read report in valgrin 
svn-id: r8578
 2003-06-21 15:32:25 +00:00
Max Horn 0832c1f662 reuse file, remove file2 usage 
svn-id: r8573
 2003-06-20 12:25:37 +00:00
Travis Howell b95ad27849 misc. 
svn-id: r8514
 2003-06-16 08:28:15 +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
Max Horn 9ef0657c5c renamed Sound -> BaseSound to avoid conflicts with the scumm class of the same name (we really should start to put all the Scumm/Simon/Sky code into namespaces 
svn-id: r8508
 2003-06-15 12:22:19 +00:00
Max Horn 7f7ce14d5e cleanup 
svn-id: r8507
 2003-06-15 11:52:42 +00:00
Max Horn 0d85cd1ee6 small reorg (keep private classes out of header files, if possible -> decreases compile times a bit); fixed a small memory leak for Simon2mac; don't delete _file twice in Sound subclasses 
svn-id: r8506
 2003-06-15 11:48:04 +00:00
Travis Howell 8446d7d67e Stop simon1win crashing on loading of save game 
svn-id: r8504
 2003-06-15 10:48:21 +00:00
Oliver Kiehl ce51902d7a fix for simon2 
svn-id: r8503
 2003-06-15 10:30:08 +00:00
Oliver Kiehl 4d5db88535 cleanup 
svn-id: r8502
 2003-06-15 09:55:10 +00:00
Travis Howell 16e5c50bad Small cleanup 
Fix small memory leak

svn-id: r8501
 2003-06-15 05:19:00 +00:00
Travis Howell 346e697f40 Small cleanup 
svn-id: r8500
 2003-06-15 05:04:17 +00:00
Max Horn 101df28e0b moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies) 
svn-id: r8496
 2003-06-15 01:42:19 +00:00
Max Horn f7a8cbf7c7 Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; augmented by some more changes of mine 
svn-id: r8482
 2003-06-14 18:52:30 +00:00
Jonathan Gray e3b2ca8e2f revert some changes as simon uses dynamic file objects for sound objects later on 
svn-id: r8477
 2003-06-14 15:19:41 +00:00
Jonathan Gray eb808a8d4c make file objects stack based where possible, fixes a bunch of leaks 
svn-id: r8476
 2003-06-14 14:58:08 +00:00
Max Horn be9e6e85db added quit event 
svn-id: r8398
 2003-06-08 12:11:14 +00:00
Max Horn 4b227da824 Preparations for removing GF_AFTER_V? flags 
svn-id: r8364
 2003-06-06 22:51:33 +00:00
Travis Howell bec1130148 Typo 
svn-id: r8327
 2003-06-05 14:05:48 +00:00
Travis Howell e97b91161c Adjust default _subtitle values 
svn-id: r8326
 2003-06-05 13:47:07 +00:00
Travis Howell ceb1a34b05 Last commit should have been made simon1 only 
svn-id: r8325
 2003-06-05 13:21:03 +00:00
Travis Howell 33dceea477 Commit combined speech and subtitles patch 
Add support for nosubtitles config option

svn-id: r8324
 2003-06-05 12:20:05 +00:00
Travis Howell cee02068ca Revert my last change, was correct according to disasm. but casued other problems. 
svn-id: r8265
 2003-06-02 06:39:54 +00:00
Travis Howell 803d53dd4b simon2dos uses different VGA_DELAY_BASE, fixes text disappearing in copy protection. 
svn-id: r8264
 2003-06-02 05:59:07 +00:00
Travis Howell 771dcfaad7 Rename SimonState to SimonEngine 
svn-id: r8228
 2003-06-01 09:41:56 +00:00
Travis Howell 719b34f36b Add german font set 
svn-id: r8167
 2003-05-31 11:40:32 +00:00
Travis Howell f5758f3f49 A few notes, correction and a few more errors 
svn-id: r8164
 2003-05-31 10:33:25 +00:00
Travis Howell c26389164f Fix simon1dos regression 
svn-id: r8163
 2003-05-31 07:39:39 +00:00
Travis Howell 4458704250 Broke simon 
svn-id: r8133
 2003-05-30 09:57:52 +00:00
Travis Howell a5b2774685 Small cleanup 
svn-id: r8132
 2003-05-30 09:39:21 +00:00
Travis Howell fb5bd02b40 Rename two unknown functions 
svn-id: r8131
 2003-05-30 07:46:45 +00:00
Travis Howell 0324ae9145 Correct simon2 timing 
Remove unused function

svn-id: r8130
 2003-05-30 05:39:14 +00:00
Max Horn f0a9f4fb2c added some doxygen comments to common/system.h; cleaned up the OSystem interface a bit 
svn-id: r8116
 2003-05-29 21:45:26 +00:00
Travis Howell 19684947df Add some errors to check if these opcodes are actually used 
svn-id: r8084
 2003-05-29 07:59:21 +00:00