Commit graph

42 commits

Author SHA1 Message Date
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
5e133bbf93 readResourcePatchesSCI0 and readResourcePatchesSCI1 merged. Some clean-ups
svn-id: r39138
2009-03-05 22:19:29 +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
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
Eugene Sandulenko
d53c75fc8f Fix code formatting
svn-id: r38930
2009-02-27 12:59:02 +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
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
Jordi Vilalta Prat
b5ce8d9320 Whitespace cleanup
svn-id: r38783
2009-02-22 13:11:43 +00:00
Max Horn
d9a98ddc21 SCI: cleanup
svn-id: r38779
2009-02-22 04:22:53 +00:00
Max Horn
d6e397233f SCI: More cleanup
svn-id: r38758
2009-02-21 22:40:58 +00:00
Max Horn
041869ed36 SCI: Untangling #include dependencies a bit
svn-id: r38740
2009-02-21 19:54:15 +00:00
Max Horn
eb37789f6f SCI: Renamed include/gfx_*.h to gfx/gfx_*.h and likewise for sfx header files
svn-id: r38735
2009-02-21 19:33:01 +00:00
Willem Jan Palenstijn
34f90ac043 revert large parts of r38621. error() is for fatal errors and does not return. warning() is not for debugging status messages.
svn-id: r38696
2009-02-21 14:11:41 +00:00
Paweł Kołodziejski
7e2bc28184 formating
svn-id: r38691
2009-02-21 12:33:24 +00:00
Oystein Eftevaag
25f7c37171 Wrapped the SCI engine in the Sci namespace.
svn-id: r38676
2009-02-21 10:23:36 +00:00
Filippos Karapetis
2ddce51a56 Changed more messages to warnings/errors
svn-id: r38621
2009-02-20 20:39:02 +00:00
Paweł Kołodziejski
823d924064 fixed compilation
svn-id: r38599
2009-02-20 16:19:29 +00:00
Max Horn
bc360ee525 SCI: Started rewriting file handling. Warning: This will likely introduce
regressions, but we just have to start somewhere.
- factored out some common code in engine/kfile.cpp into a separate func
- replaced many uses of chdir, getcwd, sci_init_dir etc. by equivalent
   or better functionality from SearchMan etc.
- replaced many uses of sci_open and sci_fopen by using Common::File
   and Common::Stream
- C++ified some stuff
- simplified ResourceSource a bit (loosing some unused functionality)

svn-id: r38597
2009-02-20 16:03:50 +00:00
Max Horn
e736b7fa62 SCI: Renamed some ResourceManager members, cleanup
svn-id: r38596
2009-02-20 15:55:59 +00:00
Max Horn
617c63c1ed SCI: Removed unused allow_patches param/member
svn-id: r38595
2009-02-20 15:47:37 +00:00
Max Horn
f78f2aeafc SCI: Renamed resource_source_t -> ResourceSource; some cleanup
svn-id: r38593
2009-02-20 15:41:58 +00:00
Max Horn
a2aba2f18e SCI: Renamed resource_mgr_t -> ResourceManager; added remark to 'the other resource manager' that it should be renamed to GraphicsManager or so
svn-id: r38592
2009-02-20 15:24:22 +00:00
Travis Howell
0ac0749810 Fix SCI 1.1 detection.
svn-id: r38535
2009-02-19 04:16:20 +00:00
Max Horn
4493c757b5 SCI: Added G_DIR_SEPARATOR to scicore/resource.cpp for now (I'll remove it again soon)
svn-id: r38498
2009-02-18 19:19:29 +00:00
Filippos Karapetis
0d82e05bb6 Added FIXME concerning crash when exiting a SCI game
svn-id: r38472
2009-02-18 12:09:11 +00:00
Paweł Kołodziejski
83656cc9ad don't attempt display resource type name if it's out of array, so it give access violation
svn-id: r38449
2009-02-17 21:18:11 +00:00
Eugene Sandulenko
87e7f85410 Update headers. scicore/
svn-id: r38411
2009-02-17 15:09:09 +00:00
Filippos Karapetis
d39d83e525 Replaced sci_free() with free() - it's OK to free a NULL pointer, so the checking that sci_free() performed is not necessary
svn-id: r38406
2009-02-17 13:51:52 +00:00
Max Horn
ddaa25cf29 SCI: cleanup
svn-id: r38335
2009-02-16 00:34:40 +00:00
Max Horn
5ecfecd3bc SCI: Run astyle to make the code be more compliant with our Code Formatting Guidelines: scicore dir
svn-id: r38318
2009-02-15 22:28:50 +00:00
Max Horn
e90eed4ff3 SCI: Changed _WIN32 -> WIN32; _DREAMCAST -> __DC__; removed _DOS stuff
svn-id: r38305
2009-02-15 21:27:42 +00:00
Willem Jan Palenstijn
b484e82821 retreive->retrieve
svn-id: r38296
2009-02-15 20:40:49 +00:00
Max Horn
a49d29cf6f cleanup, fixed warnings
svn-id: r38282
2009-02-15 19:15:43 +00:00
Filippos Karapetis
06186502b2 Silenced more warnings
svn-id: r38267
2009-02-15 16:45:39 +00:00
Max Horn
9daed50e01 Fixed lots of warnings and errors (on my system) by backporting a patch I had sent the FreeSCI folks some time ago (but apparently it never made it, or only made it to a branch not imported?)
svn-id: r38245
2009-02-15 14:46:42 +00:00
Filippos Karapetis
24dc986944 Silenced a ton of warnings, and disabled several unreferenced functions (dead code) - hopefully, compilation hasn't been broken...
svn-id: r38243
2009-02-15 14:26:33 +00:00
Paweł Kołodziejski
0724206156 fixed compilation and linking with msvc9
svn-id: r38232
2009-02-15 12:29:09 +00:00
Eugene Sandulenko
e241843bec - Remove some unneeded files
- Mass rename .c to .cpp

svn-id: r38227
2009-02-15 11:39:07 +00:00
Renamed from engines/sci/scicore/resource.c (Browse further)