ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,188 Commits 45 Branches 139 Tags
57504cb699c98d3257d5cb39aa6971b6aacf211c
Commit Graph
80 Commits
Author SHA1 Message Date
Filippos Karapetis 0b47fa50ae Applied a slightly modified patch from clone2727 which adds static selector names to some demos which are missing them (KQ4, LSL1, LSL3, Iceman and Christmas1992) 
svn-id: r42372
 2009-07-11 06:33:19 +00:00
Max Horn 6b1110b82d SCI: Moved MemObject code into a separate source file 
svn-id: r41166
 2009-06-04 11:45:17 +00:00
Filippos Karapetis 3490819a66 - Removed debug_mode from the engine state 
- Turned all SCIkwarn and SCIkdebug functions to ScummVM's debugC function
- Placed some debug code in appropriate defines: DEBUG_PARSER, DEBUG_AVOIDPATH and DEBUG_SOUND
- Removed the "debuglog" command and the "script_checkloads_flag" and "sci_debug_flags" variables

svn-id: r41033
 2009-05-30 15:40:49 +00:00
Filippos Karapetis 56c0a41b71 SCI: Moved the rest of the console code out of sciconsole.cpp and into console.cpp. "list" and "hexgrep" have been added to the console commands. parse_reg_t() has been moved to kmovement.cpp (as it's the only code using it). Note that the debug commands in scriptdebug.cpp have not been converted yet, so they don't work at the moment 
svn-id: r41024
 2009-05-30 10:22:53 +00:00
Filippos Karapetis 7d0c861506 Merged res_view0.cpp and res_view1.cpp 
svn-id: r40997
 2009-05-29 14:16:51 +00:00
Max Horn b72c2a29fb SCI: Removing useless adlib-via-OSS code 
svn-id: r40992
 2009-05-29 13:04:32 +00:00
Max Horn 99b520dd09 SCI: Merged SfxPlayer/NewPlayer code into sfx/core.cpp 
svn-id: r40965
 2009-05-28 22:02:45 +00:00
Max Horn c96cf97ea7 SCI: Merged vocab_debug.cpp into vocabulary.cpp; cleanup 
svn-id: r40915
 2009-05-26 14:44:14 +00:00
Max Horn 1e2c539e42 SCI: Removing obsolete soft sequencer files 
svn-id: r40914
 2009-05-26 14:43:47 +00:00
Max Horn 7050c5065f SCI: removed realtime and polled player, as well as the sfx/device dir, after discussion with Walter 
svn-id: r40913
 2009-05-26 14:09:07 +00:00
Max Horn 1d00cc5df0 SCI: Turned sfx_player_t into a class SfxPlayer, and converted the existing players to subclasses of that 
svn-id: r40912
 2009-05-26 11:49:10 +00:00
Max Horn c5539b4e4e SCI: Preparing to transform sfx_player_t into a class 
svn-id: r40911
 2009-05-26 11:35:35 +00:00
Walter van Niftrik 36fe37443d SCI: Added support for KQ6 movies. 
svn-id: r40774
 2009-05-21 22:03:23 +00:00
Max Horn f5f48fff3a SCI: Moved the few kernel functions that were in kernel.cpp to a new file kmisc.cpp 
svn-id: r40738
 2009-05-20 17:51:55 +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 41af51d645 Simplified and re-enabled the debug code that shows pixmaps on screen and moved sciprintf() to tools.cpp 
svn-id: r40542
 2009-05-13 21:22:53 +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
Max Horn 0255cd0213 SCI: Removed sci_memory.h/.cpp 
svn-id: r40514
 2009-05-12 23:30:10 +00:00
Max Horn 527463dea2 SCI: turn the various gfx filters from #define hacks into template funcs 
svn-id: r40386
 2009-05-08 16:01:25 +00:00
Eugene Sandulenko efa3d244fa Sync with adlib.cpp rename 
svn-id: r40354
 2009-05-06 11:01:58 +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
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 0501542b79 Fixed compilation 
svn-id: r39688
 2009-03-25 12:58:22 +00:00
Filippos Karapetis 34d75e455b - Renamed gfx/sci_widgets.* to gfx/gfx_gui.*, as these files contain GUI elements mostly, like windows and status bars 
- Moved kWindowAutoRestore from gfx_widgets.h to gfx_gui.h

svn-id: r39687
 2009-03-25 12:52:03 +00:00
Walter van Niftrik f81e5747bd SCI: removed aatree.o from module 
svn-id: r39546
 2009-03-19 22:49:54 +00:00
Travis Howell ab4812b734 Fix compile of SCI engine. 
svn-id: r39517
 2009-03-18 14:04:57 +00:00
Filippos Karapetis bc37ec4ce1 Renamed resmgr.cpp -> gfx_resmgr.cpp 
Moved all files from gfx/resource/* to gfx/*

svn-id: r39515
 2009-03-18 13:24:47 +00:00
Filippos Karapetis e546c60948 Further objectification of the graphics resource manager 
svn-id: r39499
 2009-03-17 23:30:57 +00:00
Max Horn c5e8c48c5e SCI: Removed sbtree code by Common::Hashmap 
svn-id: r39439
 2009-03-16 05:44:20 +00:00
Max Horn 466ba4bbfe SCI: Rewrote the save/load code, see also patch #2687400. 
The new format is incompatible with the old one, and is still subject to
some further changes. Also, regressions are quite possible, so watch out.
Finally, the new code still contains some TODOs and FIXMEs. Several of
these will be more or less automatically resolved once other code gets
C++ified.

svn-id: r39430
 2009-03-15 20:31:29 +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 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