Commit Graph
7940 Commits
Author SHA1 Message Date
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
Max Horn 4f555bf36e SCI: Removed resource_map.o and resource_patch.o from module.mk
svn-id: r39176
2009-03-07 05:55:42 +00:00
Greg Frieger de20838804 Added detection of SCI1.1 and SCI32 resource volumes
svn-id: r39175
2009-03-07 05:44:36 +00:00
Greg Frieger f1dd168aae Merged scicore/resource_map.cpp and scicore/resource_patch.cpp to scicore/resource.cpp because these remaining functions are members of ResourceManager
svn-id: r39172
2009-03-07 04:49:34 +00:00
Greg Frieger 7fe1dbdf16 Cleaned / reworked readResourceMapSCI0 and readResourceMapSCI1
Removed unused functions and #defines

svn-id: r39171
2009-03-07 04:42:59 +00:00
Greg Frieger 18efc44768 Use map/volume versions from detection.cpp if set
svn-id: r39170
2009-03-07 01:08:34 +00:00
Greg Frieger f028f53d3e Map/volume loader and version detection functions cleaned and reworked.
Autodetection still misdetects some SCI1/SCI1.1 games though.

svn-id: r39169
2009-03-07 00:59:38 +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 c4a09af0af Cleanup and unification. Merged decryptinit3() inside decrypt3()
svn-id: r39155
2009-03-06 13:09:10 +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
Max Horn 018d19e020 SCI: Some cleanup to the SongIteratorMessage code
svn-id: r39151
2009-03-06 07:25:37 +00:00
Max Horn 24dac898fe SCI: Converted SongIterator::get_pcm_feed into a virtual method
svn-id: r39150
2009-03-06 07:25:25 +00:00
Max Horn f8d9e4fdcc SCI: Restructured PolledPlayerAudioStream::readBuffer a bit
svn-id: r39149
2009-03-06 07:25:15 +00:00
Max Horn 5e2ee01b39 SCI: Renamed lots of classes related to song iterators; allocate song iterators via new/delete instead of malloc/free
svn-id: r39148
2009-03-06 07:25:06 +00:00
Greg Frieger 865b213439 - Change Resource::LRU to use Common::List
- Real patch filename stored and used instead of calling patch_sprintf_funct()
- some fprintf()s replaced with debug() and warning() 

svn-id: r39140
2009-03-05 23:27:02 +00:00
Greg Frieger b7ad1cf1f2 Removed Resource.location_dir_name
svn-id: r39139
2009-03-05 22:28:00 +00:00
Greg Frieger 5e133bbf93 readResourcePatchesSCI0 and readResourcePatchesSCI1 merged. Some clean-ups
svn-id: r39138
2009-03-05 22:19:29 +00:00
Andre Heider 7ef3a59a2c don't crash if sound has been disabled or the backend driver failed to initialize.
svn-id: r39137
2009-03-05 21:50:01 +00:00
Sven Hesse 2017d1c9ea Added a missing NULLing
svn-id: r39134
2009-03-05 19:43:12 +00:00
Jordi Vilalta Prat 047f116515 Renamed MetaEngine::getCopyright() to getOriginalCopyright() to better match the meaning of the returned string, as discussed some time ago in scummvm-devel
svn-id: r39132
2009-03-05 12:04:58 +00:00
Max Horn 2a7eef19c0 SCI: Removed unused FEED_MODE_DEAD, extended FIXME comment for FEED_MODE_RESTART
svn-id: r39119
2009-03-04 08:04:28 +00:00
Max Horn dbb59ce3a1 SCI: Merged polled player & PCMFeedAudioStream -> PolledPlayerAudioStream
svn-id: r39118
2009-03-04 07:59:33 +00:00
Max Horn ce5c6f3a95 SCI: Added FIXME about Opl2 driver hardcoding sample rate. well, we probably should ditch that one and use our fmopl...
svn-id: r39117
2009-03-04 07:46:27 +00:00
Max Horn ac2d012ae5 SCI: Merged sfx/mixer.cpp into sfx/player/polled.cpp
svn-id: r39116
2009-03-04 07:38:49 +00:00
Max Horn e783859d5c SCI: Replaced sfx_iterator_make_feed and associated code by Audio::makeLinearInputStream
svn-id: r39115
2009-03-04 07:31:31 +00:00
Max Horn 0a206fb031 SCI: Use Audio::Timestamp instead of sfx_timestamp_t
svn-id: r39113
2009-03-04 06:58:51 +00:00
Max Horn 92eceb741a SCI: mixer cleanup
svn-id: r39111
2009-03-04 06:23:14 +00:00
Max Horn 66b78a81dd SCI: Moved script.cpp from scicore/ to engine/ (because its header file is there, and it seems its funcs are only called from stuff in engine/)
svn-id: r39108
2009-03-04 05:25:31 +00:00
Max Horn 900fdc514c SCI: Reduce header interdeps
svn-id: r39107
2009-03-04 05:22:29 +00:00
Max Horn 302a99a2c0 SCI: cleanup
svn-id: r39106
2009-03-04 05:19:19 +00:00
Max Horn 57e0d16112 SCI: Added TODO (rect_t should be replaced by Common::Rect), minor tweaks
svn-id: r39105
2009-03-04 05:09:35 +00:00
Max Horn 2943234d6f SCI: Fix warnings
svn-id: r39103
2009-03-04 04:35:06 +00:00
Greg Frieger bc3702dcdb - ResourceManager uses HashMap to store and access resource info.
- Changes and clean-ups in resource loading code.

svn-id: r39098
2009-03-03 23:07:06 +00:00
Filippos Karapetis 0c37876830 Merged unpackDCL_hdyn() and unpackDCL() and removed some unused code
svn-id: r39093
2009-03-03 17:50:30 +00:00
Filippos Karapetis a4e4de9ecd Fixed crash in SQ4
svn-id: r39091
2009-03-03 17:20:02 +00:00
Greg Frieger cbb6f91967 SCI1: Improved color mapping when drawing line/box/text. Text with transparent background now displays correctly.
svn-id: r39089
2009-03-03 14:27:49 +00:00
Filippos Karapetis f31990f897 Gave decompression methods more descriptive names. Some cleanup
svn-id: r39082
2009-03-02 22:16:44 +00:00
Filippos Karapetis 59e847dc2d Cleanup
svn-id: r39081
2009-03-02 21:45:31 +00:00
Filippos Karapetis 286670d424 Slight cleanup
svn-id: r39069
2009-03-02 10:41:37 +00:00
Filippos Karapetis f72e3354e8 Slight cleanup
svn-id: r39068
2009-03-02 10:34:31 +00:00
Willem Jan Palenstijn 0e134d5871 Partial revert of "Fix handling of parentheses in said specs" (20080705)
This fixes, among other things, "get up" followed by "get shirt"
at the start of Iceman.

svn-id: r39060
2009-03-01 22:19:49 +00:00
Max Horn 4f2f82adc2 SCI: Unified some of the decompression funcs (they share so much code, would be nice to reduce the code duplication)
svn-id: r39057
2009-03-01 22:03:37 +00:00
Max Horn 8022122bb9 SCI: Added kDebugLevelDclInflate; changed decompressors to *not* use fprintf or printf
svn-id: r39055
2009-03-01 21:48:39 +00:00
Max Horn 00db87563a SCI: Reimplemented the SCI mixer based on the old SCI DC mixer by walter, and by taking advantage of ScummVM's mixers capabilities. Got rid of sfx_pcm_mixer_t
svn-id: r39053
2009-03-01 21:23:44 +00:00