Commit Graph

483 Commits

Author SHA1 Message Date
Johannes Schickel
21b2c7bceb Formatting/Cleanup.
svn-id: r26511
2007-04-15 16:41:20 +00:00
Johannes Schickel
b9443dfb60 More cleanup.
svn-id: r26502
2007-04-15 14:38:02 +00:00
Johannes Schickel
504df5a48e cleanup.
svn-id: r26499
2007-04-15 14:19:27 +00:00
Johannes Schickel
8c4e539a40 Readded lost files.
svn-id: r26496
2007-04-15 13:44:49 +00:00
Johannes Schickel
5e1c6c7907 - Renamed some files for consistency with other engines.
- Kyra2 detector entries update.

svn-id: r26494
2007-04-15 13:39:08 +00:00
Johannes Schickel
e8b6baca74 Little WSA loading fix.
svn-id: r26375
2007-04-03 14:26:12 +00:00
Gregory Montoir
5aca9dce8c added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
svn-id: r26357
2007-04-01 17:36:13 +00:00
Johannes Schickel
397c10f059 made _vm/_engine usage consistent. (_engine -> _vm all over the place now).
svn-id: r26342
2007-04-01 13:10:50 +00:00
Max Horn
508befd556 fixed const correctness
svn-id: r26307
2007-03-27 14:12:16 +00:00
Johannes Schickel
fb9b9863e3 Commit of patch #1688065 ("KYRA: fm towns music").
svn-id: r26305
2007-03-26 12:25:12 +00:00
Johannes Schickel
f145890bba Some tempo fixes from Florian.
svn-id: r26300
2007-03-25 15:54:15 +00:00
Johannes Schickel
d1645e2fbf Commit of patch #1686414 ("Kyra: FM-Towns music").
svn-id: r26285
2007-03-24 00:04:08 +00:00
Johannes Schickel
661944a0f9 Implemented some palette code differences for Amiga version.
svn-id: r26281
2007-03-23 16:24:28 +00:00
Johannes Schickel
2517960b3f - more cleanup
- added some .pak file integrity checks

svn-id: r26264
2007-03-20 21:11:42 +00:00
Johannes Schickel
b17ae7017c Little cleanup.
svn-id: r26263
2007-03-20 20:46:19 +00:00
Max Horn
888e68f433 KYRA: Changed to use EventManager::getMousePos (should improve some things: the old code did not properly track the mouse upon click events, and KyraEngine::waitForEvent ignored _flags.useHiResOverlay)
svn-id: r26221
2007-03-18 18:27:52 +00:00
Johannes Schickel
c7c79e33db Fixed various gui strings in German floppy.
svn-id: r26211
2007-03-18 16:15:19 +00:00
Johannes Schickel
d611e81672 - little 'cleanup'
- finished MSC file support for Amiga version

svn-id: r26204
2007-03-18 12:08:13 +00:00
Max Horn
ed54ea9155 Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
2007-03-17 19:02:05 +00:00
Torbjörn Andersson
53624376b4 Applied my re-revised patch #1487149 ("Simplified keyboard repeat"), with
Fingolfin's blessings. Keyboard repeat is now handled by the event manager,
rather than by individual engines.

Since this can cause problems with some engines (see the AGI engine), the extra
"key down" events are marked as "synthetic", so that they can be ignored if
necessary.

svn-id: r26170
2007-03-17 15:44:26 +00:00
Max Horn
15d9bc42ea Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
2007-03-17 00:53:21 +00:00
Johannes Schickel
4951f82c65 Basic support for Amiga MSC files.
svn-id: r26153
2007-03-16 23:08:59 +00:00
Johannes Schickel
689ea77c0d WIP code for Amiga version:
- Font displaying is not yet supported.
- Intro should be glitch free
- all other things are *untested*

svn-id: r26113
2007-03-12 20:43:56 +00:00
Max Horn
783a6d7d59 Fixed const issue (casting const to non-const)
svn-id: r26027
2007-03-08 20:44:43 +00:00
Johannes Schickel
305a1525ed - cleanup
- some diffs for Amiga version

svn-id: r26010
2007-03-07 20:31:19 +00:00
Max Horn
029b8c4323 Changed the order of the parameters of makeLinearInputStream to resemble Mixer::playRaw; also made makeLinearInputStream honor FLAG_LOOP (and for this, changed its loop related params slightly)
svn-id: r25926
2007-03-02 15:26:22 +00:00
Max Horn
8466221fce Simplify code a bit -- got rid of File::incRef usage, an unnecessary member var, fixed a potential memory leak (if all channels are in use), and fixed a potential OOB error (if stopSound(-1) was called)
svn-id: r25916
2007-03-01 17:04:50 +00:00
Torbjörn Andersson
61e2a9eb78 Clarified some comments and moved some asserts to hopefully answer Fingolfin's
question why we always created a mono audio stream. There are other games that
use more advanced versions of the VQA format, but it seems unlikely that
ScummVM will ever support any of them.

svn-id: r25911
2007-02-28 18:25:42 +00:00
Max Horn
8c8abca6f8 Changed the AppendableAudioStream code to use a queue of buffers, instead of a fixed size wrap-around memory buffer (this reduces memory usage in some cases by 500-700k, while actually being more flexible)
svn-id: r25909
2007-02-28 14:48:26 +00:00
Max Horn
a2a46c55d2 Using FLAG_AUTOFREE implies free() being called on the memory buffer you passed to the audio stream code -- hence, use malloc and not new[] to allocate the buffer
svn-id: r25877
2007-02-26 11:16:31 +00:00
Max Horn
b3931a847d Trying to unify the order in which we try the various audio formats: Prefer FLAC (lossless) over Ogg Vorbis ('free') over MP3 -- the order is admittedly somewhat arbitrary, but at least now it's consistent across all parts of ScummVM
svn-id: r25837
2007-02-24 23:40:28 +00:00
Travis Howell
990132687d Add the Hand of Fate demo.
svn-id: r25816
2007-02-24 09:55:37 +00:00
Johannes Schickel
60fbbc2704 Fixed black screen in the outro sequence.
svn-id: r25791
2007-02-22 18:03:05 +00:00
Johannes Schickel
15168e6c42 c&p error
svn-id: r25775
2007-02-21 22:29:45 +00:00
Max Horn
227a080e5b Patch #1663933 (Kill premix channel) with a few tiny additional tweaks by me
svn-id: r25752
2007-02-20 18:50:17 +00:00
Torbjörn Andersson
1987813f53 Another batch of header consistency changes.
svn-id: r25746
2007-02-20 17:33:54 +00:00
Max Horn
b8aeefaffb Added finalize() method to Common::OutSaveFile (which by default just flushes the stream), changed engines to call that before deleting OutSaveFile instances (instead of just flushing)
svn-id: r25660
2007-02-17 18:55:51 +00:00
Torbjörn Andersson
546758a086 Only set up the Kyra 1 triggers for Kyra 1, not Kyra 2.
svn-id: r25650
2007-02-17 08:06:21 +00:00
Torbjörn Andersson
809a3bc293 Applied cyx's patch #1659302 ("KYRA: VQA player code cleanup/reduce") with the
minimal change suggested in the tracker.

svn-id: r25649
2007-02-17 07:49:12 +00:00
Torbjörn Andersson
16e7a12878 Some very obvious cleanups.
svn-id: r25635
2007-02-16 17:13:29 +00:00
Johannes Schickel
940e89d00e Added support for Kyrandia 2 ADL files.
svn-id: r25634
2007-02-16 16:57:59 +00:00
Max Horn
7572d2b4f2 Changed detectBestMatchingGame to return a pointer to a ADGameDescription (or a subclass of it); added a (currently fake) fallback callback entry in ADParams
svn-id: r25574
2007-02-13 23:37:44 +00:00
Eugene Sandulenko
da7d8c9f35 Rename Common::GF_XXX to Common::ADGF_XXX
svn-id: r25545
2007-02-13 13:42:28 +00:00
Max Horn
55adc889e7 (re)added flags field to ADGameDescription, with currently only one value (GF_DEMO) -- this flag value is not yet used by anything (also, GF_DEMO hasn't been correctly set for AGI games yet)
svn-id: r25539
2007-02-13 01:28:18 +00:00
Johannes Schickel
80bc94304c little fix for fm-towns version
svn-id: r25531
2007-02-12 19:08:34 +00:00
Johannes Schickel
7af17382b5 Support for Japanese FM-Towns version. (code contributed by Florian Kagerer, modified a bit)
svn-id: r25530
2007-02-12 18:01:51 +00:00
Johannes Schickel
46747d8396 should fix warnings in msvc.
svn-id: r25484
2007-02-11 03:21:27 +00:00
Johannes Schickel
841fd4f94f cleanup
svn-id: r25479
2007-02-11 01:38:15 +00:00
Johannes Schickel
1cc18f6e7b Don't rely on assert when calling functions.
svn-id: r25426
2007-02-08 09:41:10 +00:00
Johannes Schickel
00d4aea7e6 Fixed GUI strings in FM-Towns version.
svn-id: r25425
2007-02-08 09:24:33 +00:00