Commit Graph

156 Commits

Author SHA1 Message Date
Walter van Niftrik
8adc948001 SCI: Adlib: added support for rhythm channel
svn-id: r40874
2009-05-24 22:32:21 +00:00
Johannes Schickel
b3c6751b9b Strip trailing whitespaces in the whole code base.
svn-id: r40867
2009-05-24 15:17:42 +00:00
Walter van Niftrik
248f415fac SCI: Added partial support for SCI1.1 adlib music
svn-id: r40800
2009-05-23 01:41:09 +00:00
Max Horn
bba91075bf removed trailing whitespaces
svn-id: r40742
2009-05-20 17:53:31 +00:00
Willem Jan Palenstijn
a897ee239d Fix compilation
svn-id: r40611
2009-05-15 14:23:00 +00:00
Filippos Karapetis
87e8f94fde - Moved all the files out of /sci/scicore and into /sci
- Moved /scicore/sciconsole.h into /engine, and renamed /engine/scriptconsole.cpp to /engine/sciconsole.cpp

svn-id: r40608
2009-05-15 14:07:45 +00:00
Filippos Karapetis
e940bcff23 - Simplified SCI version detection a bit and clarified the different version feature flags (not used yet)
- Removed the version verification functions (they were only used for two specific cases, but the SCI executable reader is able to detect the exact SCI game version anyway, so there is no point in having these)
- Removed the empty GameFlags structure and replaced it with a 32-bit integer instead

svn-id: r40524
2009-05-13 16:52:41 +00:00
Filippos Karapetis
9cdb4c36a7 Fixed regression in SCI1 games from commit #40518
svn-id: r40523
2009-05-13 16:22:26 +00:00
Max Horn
37a0157c97 SCI: cleanup
svn-id: r40518
2009-05-12 23:32:32 +00:00
Max Horn
05c3c6ccb3 SCI: Replaced SFX_OK/SFX_ERROR by Common::Error, and got rid of sfx/sfx.h
svn-id: r40517
2009-05-12 23:31:55 +00:00
Max Horn
0255cd0213 SCI: Removed sci_memory.h/.cpp
svn-id: r40514
2009-05-12 23:30:10 +00:00
Johannes Schickel
a586017bea Fall back to plain OPL2 emulation, when Dual OPL2 isn't available.
svn-id: r40497
2009-05-12 18:45:17 +00:00
Johannes Schickel
4f0768b909 - Add support for selecting the OPL emulator being used (config entry: "opl_driver")
- Make MAME FM OPL the default emulator again
- Add GUI support for selecting the active OPL emulator
- Update themes

svn-id: r40496
2009-05-12 18:42:44 +00:00
Filippos Karapetis
1b8c5f483f Silenced MSVC warning about unsafe mix of byte and boolean
svn-id: r40471
2009-05-12 07:19:49 +00:00
Filippos Karapetis
b9a026eb20 Merged find_dev() inside sfx_find_device()
svn-id: r40456
2009-05-11 17:08:31 +00:00
Paul Gilbert
25e844655e Sync with adlib.cpp rename
svn-id: r40358
2009-05-06 11:11:44 +00:00
Eugene Sandulenko
efa3d244fa Sync with adlib.cpp rename
svn-id: r40354
2009-05-06 11:01:58 +00:00
Eugene Sandulenko
a9d1e5efa9 Rename duplicate named files in order to make MSVC happier
svn-id: r40353
2009-05-06 11:00:24 +00:00
Walter van Niftrik
563c6d59d3 SCI: Modified the new adlib driver for the dosbox adlib emulator, and enabled the new player.
svn-id: r40343
2009-05-06 01:18:12 +00:00
Walter van Niftrik
bd82af01c2 SCI: Removed stereo support from the soon-to-be-removed old SCI adlib driver
in order to get it working with the new adlib emulator.

svn-id: r40336
2009-05-05 22:07:50 +00:00
Johannes Schickel
ad38e0def0 Update SCI code for the upcoming AdLib emulator changes:
- Switch old 'opl2' code to use less of the MAME specific API.
- Since 'interleave' parameter on "YM3812UpdateOne" will be dropped, work around that in SCI code by hand.

svn-id: r40332
2009-05-05 21:34:32 +00:00
Walter van Niftrik
274d890f5b SCI: Support for 0x4e control changes in new adlib driver, and some cleanup.
svn-id: r40312
2009-05-05 01:51:39 +00:00
Walter van Niftrik
c7a5a17acf SCI: adlib support (work-in-progress) for the new music player.
svn-id: r40287
2009-05-03 21:11:09 +00:00
Filippos Karapetis
f1893d8f25 WIP (still non-working) code for speech sync in CD talkie games (like e.g. KQ5 CD and SQ4 CD), taken from Greg's SCI implementation.
svn-id: r40142
2009-04-25 08:50:42 +00:00
Max Horn
3eab407cd5 SCI: Replaced memory ref counting code in the SongIterator code by a simple Common::Array<byte> object; also doxygenified some source comments
svn-id: r40032
2009-04-20 19:28:55 +00:00
Walter van Niftrik
695bc36b9a SCI: Added a new song player (work-in-progress).
svn-id: r39953
2009-04-15 10:45:59 +00:00
Filippos Karapetis
c4e054848e Changed some references from "FreeSCI" to "SCI" or "ScummVM"
svn-id: r39807
2009-04-03 08:10:58 +00:00
Max Horn
7df4e2a80f SCI: Indention changes, changed 'songlib_t' params to 'const songlib_t &'
svn-id: r39429
2009-03-15 20:31:15 +00:00
Max Horn
642bad22d8 SCI: Removed most uses of the 'inline' keyword. It is usually better to let the compiler figure out what to inline. As it is, most of these looked as if they were randomly placed ;)
svn-id: r39352
2009-03-12 03:26:47 +00:00
Filippos Karapetis
966972def6 Fixed another crash right at the beginning of SQ4
svn-id: r39347
2009-03-11 23:44:22 +00:00
Max Horn
4da6fbbb76 SCI: Memory 'ref counting' code is only used by song iterators -> move it there, make it private (to be replaced one day by something else, e.g. Common::SharedPtr)
svn-id: r39305
2009-03-10 19:08:07 +00:00
Max Horn
7f1a9b385d SCI: SongIterator::Message only needs to transfer a single argument, so get rid of the second slot
svn-id: r39290
2009-03-10 02:57:30 +00:00
Max Horn
6b58973536 SCI: Renamed SongIteratorMessage -> SongIterator::Message; cleanup
svn-id: r39289
2009-03-10 02:42:22 +00:00
Max Horn
842a42b1bd SCI: More SongIterator refactoring.
* Added SongIterator::clone()
* got rid of songit_clone()
* removed SIMSG_CLONE and related code
* removed SongIterator::flags
* turned songit_new_tee into TeeSongIterator constructor

svn-id: r39288
2009-03-10 02:41:56 +00:00
Willem Jan Palenstijn
1e4c9488f2 Don't adjust data pointer in makeStream.
It is already adjusted in getAudioStream.

svn-id: r39276
2009-03-09 21:11:39 +00:00
Max Horn
7ec2a98177 SCI: Added BaseSongIterator copy constructor which invokey sci_refcount_incref
svn-id: r39273
2009-03-09 19:55:18 +00:00
Willem Jan Palenstijn
d2514d20b9 Reset child iterators on deletion.
This fixes an illegal access in ~TeeSongIterator.

svn-id: r39272
2009-03-09 19:44:10 +00:00
Max Horn
4e6a7d83d1 SCI: Rewrote handling of song wakeup times & (iterator) delays, to avoid rounding issues between ticks (1/60s) and milliseconds; also fixed a bug (coming from Glutton ;) where delays measured in millisecs were treated as ticks instead. Thanks to Walter for the precursor of this patch
svn-id: r39263
2009-03-09 16:15:35 +00:00
Max Horn
7bfab75a08 SCI: Fixed regression in new_fast_forward_iterator
svn-id: r39215
2009-03-08 08:17:59 +00:00
Filippos Karapetis
73a4664552 Replaced getInt15 in intstrument-map.cpp as well
svn-id: r39196
2009-03-07 17:55:00 +00:00
Filippos Karapetis
1e29983d8e Replaced getInt16, getUInt16 and putInt16
svn-id: r39189
2009-03-07 16:14:20 +00:00
Max Horn
18b3454280 SCI: Replaced linked list of Sci1Samples by a Common::List
svn-id: r39178
2009-03-07 06:57:17 +00:00
Max Horn
c2f08b10d2 SCI: More cleanup in the song iterator codebase
svn-id: r39177
2009-03-07 06:56:39 +00:00
Filippos Karapetis
fc4df48e13 SongIterator is a class, not a struct
svn-id: r39167
2009-03-06 23:52:12 +00:00
Max Horn
54e1256b0e SCI: Reduce SFX header dependencies
svn-id: r39159
2009-03-06 18:11:12 +00:00
Max Horn
763275f269 SCI: Continued C++ification of SongIterator code
svn-id: r39158
2009-03-06 17:53:11 +00:00
Max Horn
e134281b5c SCI: Fixed (I hope) song iterator death listeners; and some cleanup
svn-id: r39157
2009-03-06 17:39:46 +00:00
Max Horn
e3ac2ecfaa SCI: Started to revamp the song iterator death notification system (which currently is mess :)
svn-id: r39156
2009-03-06 17:39:15 +00:00
Filippos Karapetis
b8a2b38e41 SongIterator is a class, not a struct
svn-id: r39154
2009-03-06 11:06:04 +00:00
Max Horn
0f3d67c1ac SCI: C++ifyed SongIterator and its subclasses
svn-id: r39152
2009-03-06 07:25:48 +00:00