Commit Graph

149 Commits

Author SHA1 Message Date
Johannes Schickel
b4ef8aba75 Made Decompressor's destructor virtual. (fixes compilation and should fix possible leaks)
svn-id: r39318
2009-03-10 22:11:11 +00:00
Greg Frieger
0a38541cc5 Resource decompression functions moved to scicore\decompressor.cpp and turned into classes.
svn-id: r39311
2009-03-10 21:44:03 +00:00
Max Horn
6c93249715 SCI: result_word_t -> ResultWord; switched to Common::List for storing lists of ResultWords
svn-id: r39278
2009-03-09 22:25:33 +00:00
Sven Hesse
6ccb7bea5b Added more missing NULLing
svn-id: r39246
2009-03-08 22:44:47 +00:00
Willem Jan Palenstijn
52f3b24668 Restore potentially useful info deleted in r39188
svn-id: r39228
2009-03-08 14:27:35 +00:00
Max Horn
efa5493b2d SCI: Changed suffix list to be stored as a Common::List; also fixed spelling: suffices -> suffixes
svn-id: r39214
2009-03-08 08:17:43 +00:00
Max Horn
7cf72e8a17 SCI: Renamed vocab.cpp to vocabulary.cpp, to match the name of the header file
svn-id: r39213
2009-03-08 08:17:18 +00:00
Max Horn
877629cb2e SCI: replaced get_int_16 by READ_LE_UINT16, and got rid of inverse_16
svn-id: r39212
2009-03-08 08:16:08 +00:00
Max Horn
aad0ad3fa6 SCI: Added new header gfx/font.h and removed some dead code
svn-id: r39211
2009-03-08 08:15:56 +00:00
Filippos Karapetis
1e29983d8e Replaced getInt16, getUInt16 and putInt16
svn-id: r39189
2009-03-07 16:14:20 +00:00
Filippos Karapetis
f05e49433c Removed unused code
svn-id: r39188
2009-03-07 15:48:54 +00:00
Greg Frieger
309fb5f60b Fixed crash when reading some SCI1 resource map
svn-id: r39185
2009-03-07 14:40:58 +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
c4a09af0af Cleanup and unification. Merged decryptinit3() inside decrypt3()
svn-id: r39155
2009-03-06 13:09:10 +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
Sven Hesse
2017d1c9ea Added a missing NULLing
svn-id: r39134
2009-03-05 19:43:12 +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
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
f31990f897 Gave decompression methods more descriptive names. Some cleanup
svn-id: r39082
2009-03-02 22:16:44 +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
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
Johannes Schickel
3b16073a38 Fix warnings.
svn-id: r38997
2009-03-01 03:31:52 +00:00
Greg Frieger
8dfef3103c Added default kernel functions table to be used if vocab.999 can't be loaded in SCI1
Added SCI1.1 kernel functions table reader

svn-id: r38992
2009-03-01 01:52:50 +00:00
Jordi Vilalta Prat
7050c7b03f SCI: Use the ResourceType enum instead of integers where it makes sense
svn-id: r38988
2009-02-28 23:46:50 +00:00
Max Horn
d7b06b7d42 SCI: Renamed ResourceManager::sci_version to _sciVersion, to avoid var shadowing warnings; some other tweaks
svn-id: r38984
2009-02-28 22:19:22 +00:00
Greg Frieger
61ab59138a resource_t struct replaced with stub Resource class for future objectifying. Also the crash when exiting SCI1 games was fixed
svn-id: r38982
2009-02-28 21:59:49 +00:00
Greg Frieger
4dd1b7dad5 Turned ResourceManager into a class, along with all related functions
svn-id: r38978
2009-02-28 20:45:36 +00:00
Andre Heider
b2cd5beb9e clean up some warnings
svn-id: r38965
2009-02-28 13:41:43 +00:00
Eugene Sandulenko
d53c75fc8f Fix code formatting
svn-id: r38930
2009-02-27 12:59:02 +00:00
Max Horn
479751104f SCI: Renamed include/engine.h to engine/state.h; added a corresponding .cpp file with the EngineState constructor
svn-id: r38921
2009-02-27 02:23:40 +00:00
Max Horn
170916201c SCI: Moved almost all files from include/ to other dirs; only include/engine.h remains
svn-id: r38920
2009-02-27 02:23:00 +00:00
Max Horn
0be30cdc5d SCI: Renamed gfx/gfx_operations.h to gfx/operations.h (matching the source file); moved include/sci_widgets.h to gfx/ (matching location of source file); renamed gfx/widgets.cpp to gfx/gfx_widgets.cpp (matching the header)
svn-id: r38852
2009-02-24 20:39:34 +00:00
Eugene Sandulenko
a27285f117 Normalized guard #defines
svn-id: r38842
2009-02-24 15:33:40 +00:00
Max Horn
d19ba951e8 SCI: Moved sciconsole.h and sys_strings.h to the dirs their *.cpp counterparts are in
svn-id: r38835
2009-02-24 06:00:10 +00:00
Max Horn
b5df97ad2b SCI: Moved kernel.h and kdebug.h from include/ to engine/; untangled header deps some more
svn-id: r38833
2009-02-24 05:51:55 +00:00
Max Horn
1e4db221e5 SCI: Moved engines/sci/include/sci_memory.h and engines/sci/scicore/sci_memory.cpp into engines/sci/; moved macros from the header into the source file
svn-id: r38832
2009-02-24 05:39:10 +00:00
Max Horn
9744fc615c SCI: Changed selector name table to a Common::StringList
svn-id: r38805
2009-02-23 03:04:52 +00:00
Max Horn
327f5c9f77 SCI: Simplified code for selector lookup map generation a bit; got rid of an unused var
svn-id: r38804
2009-02-23 02:17:26 +00:00