Commit Graph

49 Commits

Author SHA1 Message Date
Max Horn
d5d7bd73d5 SCI: Moved cfsml.pl from tools/ to tools/sci/; also fixed circular dependency
svn-id: r39308
2009-03-10 19:20:32 +00:00
Max Horn
ba0d429694 SCI: EVIL temporary hack to ensure savegame.cpp is rebuilt when any of the headers it uses have been changed (to track mistakes like me forgetting to rename SongIteratorMessage -> SongIterator::Message in the CFSML, too). If anybody knows how one can 'copy' the dependencies of one target and add them to another, please let me know.
svn-id: r39307
2009-03-10 19:17:52 +00:00
Lars Skovlund
3cddcb1660 String fragments support
WIP: No regressions in this part, I hope

svn-id: r39297
2009-03-10 14:52:02 +00:00
Travis Howell
4de1cd89ca Fix compile of SCI engine.
svn-id: r39295
2009-03-10 11:16:07 +00:00
Filippos Karapetis
d7b767d90c Reverted some of the changes of commit #39192. The cursor reading code has been placed back in a separate file, and not in the resource manager (but it's now 1 function)
svn-id: r39293
2009-03-10 10:55:36 +00:00
Filippos Karapetis
c908f3c332 - Renamed files inside gfx/resource
- Merged sci_picfill_aux.cpp and sci_picfill.cpp into picfill.cpp (as this is the only place where the auxiliary fill functions are used)

svn-id: r39292
2009-03-10 10:36:43 +00:00
Willem Jan Palenstijn
ced40b2266 Use new Palette class to manager pixmap palettes.
There are some remaining regressions with text colour in SCI1 games,
but overall it should fix more than it breaks.

svn-id: r39242
2009-03-08 20:17:01 +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
Filippos Karapetis
91f2553260 Merged all the different cursor drawing functions inside gfxr_interpreter_get_cursor()
svn-id: r39192
2009-03-07 17:08:31 +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
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
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
413ded4ce4 SCI: Get rid around the first layer around the ScummVM audio mixer. Also resolve the FIXME about releasing the mixer channel we allocated
svn-id: r38949
2009-02-28 06:48:53 +00:00
Max Horn
a26b3bfde6 SCI: Get rid of extra layer around our timer manager
svn-id: r38947
2009-02-28 06:14:42 +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
Filippos Karapetis
6c879e96d1 - Removed engine/sys_strings.*
- Renamed sys_string_t -> SystemString, sys_strings_t -> SystemStrings

svn-id: r38916
2009-02-26 23:03:35 +00:00
Max Horn
595c655766 SCI: Moved (kernel) debug stuff from tools.cpp to a new file engine/kdebug.cpp
svn-id: r38867
2009-02-24 22:41:58 +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
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
35e3364675 SCI: Renamed int_hashmap to IntMapper, and added docs that explain that this is *not* a hashmap (at least not a plain hashmap)
svn-id: r38823
2009-02-24 02:59:50 +00:00
Filippos Karapetis
db343c7287 Removed unused antialiasing code (plus, we do antialiasing at the OSystem graphics backend)
svn-id: r38800
2009-02-23 00:39:00 +00:00
Filippos Karapetis
fa16c9d386 The two hardcoded fonts, 5x8 and 6x10 were used for FreeSCI's debugger and game menu, so they can be safely removed now
svn-id: r38792
2009-02-22 20:06:25 +00:00
Max Horn
7a12a67ce8 SCI: Moved aatree.* files together into engine/
svn-id: r38763
2009-02-21 22:54:15 +00:00
Max Horn
d6e397233f SCI: More cleanup
svn-id: r38758
2009-02-21 22:40:58 +00:00
Filippos Karapetis
9036c0fee0 Renamed SCI's console to sciconsole (MSVC has problems with files with the same name under different directories). ScummVM's console can be enabled correctly under MSVC now
svn-id: r38722
2009-02-21 18:46:03 +00:00
Max Horn
9f2c0dcc6f SCI: Tons of cleanup
svn-id: r38721
2009-02-21 18:39:53 +00:00
Max Horn
0d41ca8d38 SCI: Moved scicore/tools.cpp to tools.cpp, and include/resource.h to tools.h
svn-id: r38720
2009-02-21 18:28:38 +00:00
Max Horn
ecaab0fe94 SCI: Fixed warnings in engine/savegame.cpp, by improving cfsml.pl; also improved the build rule which is responsible for creating engine/savegame.cpp from engine/savegame.cfsml
svn-id: r38657
2009-02-21 03:59:57 +00:00
Filippos Karapetis
9582e48574 Some initial code for a debug console (still non-working)
svn-id: r38623
2009-02-20 21:26:31 +00:00
Filippos Karapetis
45d3382c9a We only got 1 mixer - removed the unneeded file mixers.cpp
svn-id: r38569
2009-02-20 00:31:22 +00:00
Filippos Karapetis
6f4a8dedbe Rewrote the EXE reading routines (the LZEXE compression stuff is still not completed, and will be implemented in a follow-up commit)
svn-id: r38543
2009-02-19 12:42:32 +00:00
Filippos Karapetis
7e5dba8940 Readded the code which reads the version from the original executable to the fallback detector (still very hackish...). This is probably the only known way currently to determine the version used by each game variant and add appropriate game flags
svn-id: r38509
2009-02-18 22:20:28 +00:00
Eugene Sandulenko
fd0d88f27f Fix makefile
svn-id: r38487
2009-02-18 15:07:19 +00:00
Filippos Karapetis
526ad1d1d0 We no longer verify the SCI version number against the original executables, so remove the exe file reader code
svn-id: r38460
2009-02-18 10:07:55 +00:00
Max Horn
515dfac64c SCI: -Wno-variadic-macros not needed anymore
svn-id: r38431
2009-02-17 18:16:31 +00:00
Jordi Vilalta Prat
c8a3a05a5d SCI: Changed pcm_device and timer "driver" functionality to use directly the ScummVM modules
svn-id: r38373
2009-02-16 16:23:48 +00:00
Travis Howell
954aa46b8a SCUMMVM define no longer required.
svn-id: r38361
2009-02-16 09:44:00 +00:00
Max Horn
ee92dbbe41 SCI: Committed stuff I forgot in my last commit; changed int_hash_map_t to a C++ class
svn-id: r38360
2009-02-16 09:40:25 +00:00
Max Horn
6af056c89d Reimplemented reg_t_hashmap using Common::HashMap
svn-id: r38340
2009-02-16 01:58:30 +00:00
Paweł Kołodziejski
9920d40924 fix compilation
svn-id: r38271
2009-02-15 17:20:31 +00:00
Eugene Sandulenko
8b34730107 Make MSVC happy and rename timer/scummvm.cpp to timer/timer_scummvm.cpp
svn-id: r38231
2009-02-15 12:23:54 +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
Eugene Sandulenko
e9f7428063 - Move sci/scummvm/ contents to sci/
- Rename scumm_engine.cpp to sci.cpp
- Remove unneeded gfx drivers
- Rename scummvm_driver.c to gfx_driver.cpp

svn-id: r38225
2009-02-15 11:03:21 +00:00
Eugene Sandulenko
c399437479 - Remove unneeded files
- Make whole thing finally compilable

svn-id: r38214
2009-02-15 10:10:23 +00:00
Jordi Vilalta Prat
003317e89d SCI: Get rid of the include directory hack (it compiles but it doesn't link yet)
svn-id: r38201
2009-02-15 08:34:13 +00:00
Max Horn
002d55bc93 SCI: Fix the worst compilation problems
svn-id: r38194
2009-02-15 08:09:42 +00:00
Jordi Vilalta Prat
fa6e10e9ce Import the SCI engine sources from the FreeSCI Glutton branch (it doesn't compile yet)
svn-id: r38192
2009-02-15 06:10:59 +00:00