libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,280 Commits 5 Branches 5 Tags 1.8 GiB
faa252391c
Commit Graph

741 Commits

Author SHA1 Message Date
Greg Frieger
309fb5f60b Fixed crash when reading some SCI1 resource map 
svn-id: r39185
 2009-03-07 14:40:58 +00:00
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
Andre Heider
097641f021 remove spurious links 
svn-id: r39047
 2009-03-01 19:08:01 +00:00
Andre Heider
9e7cf21ee8 verified/added a couple of amiga versions. 
svn-id: r39041
 2009-03-01 16:19:52 +00:00
Willem Jan Palenstijn
82e4168d47 Don't free a sfx_pcm_feed_t that's still in use. 
It's a rather hackish fix, but this feed-wrapping code should only be
temporary anyway.

svn-id: r39033
 2009-03-01 12:08:44 +00:00
Andre Heider
7361906f8c rescanned all amiga version from back2roots.org and added the onces which used to run with r39005 
svn-id: r39031
 2009-03-01 11:52:54 +00:00
Max Horn
7ee049ab8f SCI: Forgot to commit a couple files after renaming sfx headers 
svn-id: r39010
 2009-03-01 06:17:52 +00:00
Max Horn
d0c477e930 SCI: Removed unused pause/resume methods from the mixer, and rewrote the feeds handling to use Common::List 
svn-id: r39009
 2009-03-01 06:02:42 +00:00
Max Horn
4e0ee7abea SCI: cleanup 
svn-id: r39008
 2009-03-01 06:02:34 +00:00
Max Horn
6f290b7cd6 SCI: Removed some unused code from the SCI mixer 
svn-id: r39007
 2009-03-01 06:02:26 +00:00
Max Horn
25e7d3a08d SCI: Renamed some sfx header files 
svn-id: r39006
 2009-03-01 06:02:17 +00:00
Max Horn
6454a3dee1 SCI: Replaced fake struct 'inheritance' (using #defines) with regular C++ subclassing 
svn-id: r39005
 2009-03-01 06:01:48 +00:00
Greg Frieger
6742caa87a Text/window color matching improved by using an existing gfxop_set_color() instead of mine _gfxop_matchColor() 
svn-id: r39004
 2009-03-01 05:15:51 +00:00
Max Horn
dd98126423 Engines: Fused several init&go methods into a single run method 
svn-id: r39003
 2009-03-01 04:42:46 +00:00
Max Horn
3fcbda829a Merged Engine::go() and ::init() into a new run() method (currently implemented by calling the existing init&go methods; to be cleaned up by engine authors 
svn-id: r39002
 2009-03-01 04:30:55 +00:00
Max Horn
d0c2484502 SCI: pass gfx_pixmap_color_t instead of r,g,b triple, makes calling code a bit easier to read :) 
svn-id: r39001
 2009-03-01 04:29:09 +00:00
Greg Frieger
ce42d6e538 Fixed windows and text drawing problem in SCI1 
svn-id: r39000
 2009-03-01 04:07:04 +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
82872a7033 SCI: Start converting MessageState into a class 
svn-id: r38989
 2009-03-01 00:18:30 +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
Filippos Karapetis
8e39ac9f12 Fixed the SCI version in a version of Longbow, and fixed a typo in the MD5 of a version of SQ5 
svn-id: r38986
 2009-02-28 22:59:27 +00:00
Lars Skovlund
f179dbfc71 Add a particular release of Conquests of the Longbow. 
svn-id: r38985
 2009-02-28 22:36:48 +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
Willem Jan Palenstijn
e159979869 strip trailing newline in SCI debugger 
svn-id: r38983
 2009-02-28 22:10:07 +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
Johannes Schickel
26cb1657bc Fix warnings. 
svn-id: r38975
 2009-02-28 16:17:14 +00:00
Willem Jan Palenstijn
c388d6c455 Increase colour refcount when allocating colour 
svn-id: r38974
 2009-02-28 16:12:52 +00:00
Willem Jan Palenstijn
2d1a6309f8 Disable xfact/yfact scaling in embedded views. 
This inadvertently broke colours in KQ5 as a side effect.

svn-id: r38973
 2009-02-28 16:11:02 +00:00
Johannes Schickel
9cc4f5630e Fix warnings. 
svn-id: r38972
 2009-02-28 16:06:32 +00:00
Greg Frieger
1befd93475 Added detection for more SCI games and demos 
svn-id: r38970
 2009-02-28 15:32:01 +00:00
Andre Heider
b2cd5beb9e clean up some warnings 
svn-id: r38965
 2009-02-28 13:41:43 +00:00
Andre Heider
aff4aeae14 set the correct OPL2 frequency for Wii 
svn-id: r38964
 2009-02-28 13:39:56 +00:00
Jordi Vilalta Prat
501e4bb91a SCI: Renamed some kernel types and general cleanup 
svn-id: r38961
 2009-02-28 11:12:59 +00:00
Willem Jan Palenstijn
3bfc345350 Add support for saving Common::String objects. 
Use it to simplify SavegameMetadata handling.

svn-id: r38959
 2009-02-28 11:07:36 +00:00
Willem Jan Palenstijn
4febcde170 Make CFSML writers take const arguments 
svn-id: r38952
 2009-02-28 10:05:07 +00:00
Willem Jan Palenstijn
c76dc0b71c Initialize mixer feed variables 
svn-id: r38951
 2009-02-28 10:04:40 +00:00
Max Horn
6f72cc45a3 cleanup 
svn-id: r38950
 2009-02-28 07:23: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
Willem Jan Palenstijn
6eeec1d295 Add FIXME: We need a pcm_device->exit() function, 
to release the mixer channel allocated for pcm_device in ScummVM's mixer.

svn-id: r38941
 2009-02-27 23:53:52 +00:00
Willem Jan Palenstijn
d3e60f2ae3 Depend on backend timer API instead of a new mutex 
This fixes a deadlock between the backend's timer mutex and
the sound callbackMutex that would occur while restoring a game.

svn-id: r38939
 2009-02-27 22:20:11 +00:00
Willem Jan Palenstijn
fb8fafaf56 Fix reading corrupted saves. 
svn-id: r38934
 2009-02-27 19:50:22 +00:00
Willem Jan Palenstijn
fb552121d2 fix warnings and memleaks in savegame.cfsml 
svn-id: r38933
 2009-02-27 19:38:20 +00:00
Willem Jan Palenstijn
ede680738b sync savegame.cfsml with include/ dir changes 
svn-id: r38932
 2009-02-27 19:37:29 +00:00
Eugene Sandulenko
d53c75fc8f Fix code formatting 
svn-id: r38930
 2009-02-27 12:59:02 +00:00
Max Horn
c053ef8c87 SCI: Remove empty include/ dir 
svn-id: r38922
 2009-02-27 02:24:29 +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
bf0860fc5e SCI: Commited file handling revamp, work in progress 
svn-id: r38919
 2009-02-27 01:17:24 +00:00
Willem Jan Palenstijn
5a5c51bb48 Reset successor variable after use. 
This fixes a crash in SQ3 after reloading followed by restarting.

svn-id: r38918
 2009-02-26 23:13:00 +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
Andre Heider
2d1fd81f90 start out with an empty array of file handles, so the Enginestates matches between startup and restart. really check its size before accessing it (fixes LSL3 restart) 
svn-id: r38915
 2009-02-26 21:17:53 +00:00
Willem Jan Palenstijn
f8648767e4 fix graphics regression in Iceman caused by r38909 
svn-id: r38914
 2009-02-26 20:08:04 +00:00
Andre Heider
dbe632e8ed protect the sfx timer with the callbackMutex to fix the race the condition when restarting or restoring a game. 
svn-id: r38913
 2009-02-26 19:32:22 +00:00
Andre Heider
84daa0410f reinit sfx in game_init() when it got deinitialized in game_exit(), this unmutes the game after a restart. 
shutdown sfx in game_exit() only if there is no EngineState successor (restored game) since gamestate_restore() already reinitialized it.

svn-id: r38912
 2009-02-26 19:28:21 +00:00
Max Horn
79417f4d32 cleanup 
svn-id: r38910
 2009-02-26 16:33:48 +00:00
Max Horn
3343dca6dc SCI: Modified gfx_new_mode to take a Graphics::PixelFormat 
svn-id: r38909
 2009-02-26 16:16:53 +00:00
Max Horn
fde001ce81 SCI: Changed 'typedef enum { } NAME' into C++-style 'enum NAME { }' 
svn-id: r38908
 2009-02-26 16:16:46 +00:00
Max Horn
900dc048f4 SCI: Turned the crossblit code into a template 
svn-id: r38907
 2009-02-26 16:16:38 +00:00
Max Horn
e140188541 SCI: Some nitpick FIXMEs on incorrect opcode number comments ;) 
svn-id: r38906
 2009-02-26 16:16:30 +00:00
Max Horn
9515ae4ddc SCI: Moved gfx_line.cpp to line.h and turned _gfx_draw_line_buffer into a template 
svn-id: r38905
 2009-02-26 16:16:22 +00:00
Max Horn
edc4e58c9c SCI: Replaced #define hack to fake subclassing in C by regular C++ subclassing 
svn-id: r38904
 2009-02-26 16:16:13 +00:00
Willem Jan Palenstijn
1377a4b64c Clarify behaviour of gfxop_get_event(). 
svn-id: r38900
 2009-02-26 12:10:11 +00:00
Filippos Karapetis
387fcd101d Cleanup 
svn-id: r38898
 2009-02-26 10:44:25 +00:00
Filippos Karapetis
2fbf626d09 Cleanup 
svn-id: r38896
 2009-02-26 10:31:48 +00:00
Filippos Karapetis
6f939ff6c8 Cleanup. Readded FIXME 
svn-id: r38895
 2009-02-26 09:44:06 +00:00
Max Horn
5093167fde cleanup 
svn-id: r38891
 2009-02-26 02:21:55 +00:00
Andre Heider
522063b28c fix read_SegManagerPtr to not read from an uninitialzed pointer 
svn-id: r38889
 2009-02-25 23:50:16 +00:00
Andre Heider
9af7fba681 reintroduce game_start_time (removed it in r38701), since the interpreter can be restarted and it can be retrieved via script function (eg. LSL3 about box) 
svn-id: r38888
 2009-02-25 21:43:57 +00:00
Filippos Karapetis
1786ecabbf Initial fix for the keypad keys. We still don't know the initial state of the caps lock etc keys, so an appropriate method will need to be added to OSystem 
svn-id: r38887
 2009-02-25 20:40:05 +00:00
Filippos Karapetis
71ae2d3aba Reverted my wrong commit #38870. Most of the key codes are handled by the engine itself, however there are cases where they are handled by the game scripts, e.g. in save/load dialogs. The arrow keys in the save/load dialogs should work properly again. The numpad keys still look to be broken by some other commit 
svn-id: r38886
 2009-02-25 19:52:17 +00:00
Max Horn
c199c6c6c4 cleanup 
svn-id: r38885
 2009-02-25 19:30:11 +00:00
Max Horn
b990add13e SCI: Restored ability to warp the mouse cursor 
svn-id: r38884
 2009-02-25 19:28:46 +00:00
Max Horn
ec26d4f24b SCI: Removed code for software rendered mouse cursor 
svn-id: r38883
 2009-02-25 19:28:20 +00:00
Max Horn
71a07c7c9f SCI: Added remark that we don't track capslock, numlock, scrlock properly 
svn-id: r38882
 2009-02-25 19:05:54 +00:00
Max Horn
3a000f3d84 SCI: Simplify event polling code a little bit 
svn-id: r38881
 2009-02-25 18:59:00 +00:00
Willem Jan Palenstijn
9ed544679a Interpret NONBLOCK as PEEK; poll while sleeping. 
Also use Common::List for internal event queue.

svn-id: r38880
 2009-02-25 18:23:28 +00:00
Willem Jan Palenstijn
98a7ba4ec3 Don't truncate keycode in queued events. 
svn-id: r38878
 2009-02-25 17:36:38 +00:00
Max Horn
8280089d28 cleanup 
svn-id: r38874
 2009-02-25 02:05:43 +00:00
Max Horn
e5a7b99cee SCI: Don't #include headers in other headers if a forward declaration of a few types suffices (reduces header interdependencies) 
svn-id: r38872
 2009-02-24 23:16:42 +00:00
Max Horn
4f8e9511a1 fix warning 
svn-id: r38871
 2009-02-24 23:15:49 +00:00
Filippos Karapetis
5618a81cff Replaced some of the internal SCI scan codes with the ones from ScummVM 
svn-id: r38870
 2009-02-24 22:58:44 +00:00
Jordi Vilalta Prat
936e807ef3 Removed unused resource macros 
svn-id: r38869
 2009-02-24 22:51:19 +00:00
Filippos Karapetis
1dff55f901 Process modifier keys (capslock, numlock, scrollock) 
svn-id: r38868
 2009-02-24 22:48:39 +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
Paweł Kołodziejski
e7b0c975d9 bring back comments but as TODO comment 
svn-id: r38866
 2009-02-24 22:40:54 +00:00
Jordi Vilalta Prat
a9dfa2575a Removed some non-required struct declarations 
svn-id: r38865
 2009-02-24 22:33:39 +00:00
Jordi Vilalta Prat
9784c2dac1 Fix a valgrind warning (free -> delete) 
svn-id: r38864
 2009-02-24 22:25:39 +00:00
Paweł Kołodziejski
c2c02ceffd remove code related __GNU__XX defines 
svn-id: r38863
 2009-02-24 22:24:58 +00:00
Paweł Kołodziejski
64ca675b51 not needed include anymore 
svn-id: r38862
 2009-02-24 22:01:10 +00:00
Paweł Kołodziejski
91ee9a3eb8 not needed this includes anymore 
svn-id: r38857
 2009-02-24 21:13:32 +00:00
Paweł Kołodziejski
859477c968 not needed anymore 
svn-id: r38856
 2009-02-24 20:55:43 +00:00
Paweł Kołodziejski
9bb135ac25 not needed anymore 
svn-id: r38855
 2009-02-24 20:52:18 +00:00
Max Horn
7d2a2ece38 SCI: Replaced gfxop_usleep by gfxop_sleep (taking millisecs instead of microsecs) 
svn-id: r38854
 2009-02-24 20:50:09 +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
220270586c SCI: Removed usec_sleep from gfx_driver_t (call OSystem::delayMillis directly instead); added remarks that busy-waiting like this with delayMillis is maybe not the best way, and that gfx_driver_t should be either removed or turned into a class 
svn-id: r38851
 2009-02-24 20:33:31 +00:00
Eugene Sandulenko
241340a07e Fix compilation 
svn-id: r38850
 2009-02-24 20:11:10 +00:00
Willem Jan Palenstijn
e29c334601 state_t to EngineState 
svn-id: r38847
 2009-02-24 18:47:53 +00:00
Willem Jan Palenstijn
b4cf9e5a26 fix typo in parse rule 
svn-id: r38846
 2009-02-24 18:47:13 +00:00
Andre Heider
357299c570 substitute all time related functions, removing sci_gettime sci_get_current_time altogether. 
svn-id: r38845
 2009-02-24 18:31:05 +00:00
Andre Heider
3082586230 fix forward declarations to match the actual ones 
svn-id: r38844
 2009-02-24 18:21:12 +00:00
Eugene Sandulenko
c9f245a840 oops 
svn-id: r38843
 2009-02-24 15:40:19 +00:00
Eugene Sandulenko
a27285f117 Normalized guard #defines 
svn-id: r38842
 2009-02-24 15:33:40 +00:00
Johannes Schickel
cda5d6989b Fix some warnings. 
svn-id: r38840
 2009-02-24 15:14:15 +00:00
Walter van Niftrik
8dab4eb461 SCI: call updateScreen after every copyRectToScreen; removed internal front visual buffer 
svn-id: r38839
 2009-02-24 12:01:28 +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
7105df20fa SCI: Moved vm.h from include to engine 
svn-id: r38834
 2009-02-24 05:56:26 +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
47bc0d7879 SCI: Last batch of pathfinding cleanup 
svn-id: r38831
 2009-02-24 05:30:45 +00:00
Max Horn
325d2ec66b SCI: More pathfinding cleanup 
svn-id: r38830
 2009-02-24 05:23:42 +00:00
Max Horn
8c9bd00b51 SCI: Replaced vertex list used for dijkstra algo by Common::List; got rid of include/list.h 
svn-id: r38829
 2009-02-24 05:07:15 +00:00
Max Horn
735701983c SCI: Rewrote parts of the pathfinding code to use Common::List; also renamed some types 
svn-id: r38828
 2009-02-24 04:56:35 +00:00
Max Horn
82e0b20613 SCI: Turned circular list code into a small class 
svn-id: r38827
 2009-02-24 04:30:41 +00:00
Max Horn
3a8dd2b467 SCI: cleanup 
svn-id: r38826
 2009-02-24 04:01:53 +00:00
Max Horn
62126681f3 SCI: Removed unused header file event.h 
svn-id: r38825
 2009-02-24 03:43:44 +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
Willem Jan Palenstijn
6c3a758cf6 SCI: translate cursor's palette to global palette 
svn-id: r38822
 2009-02-23 23:49:11 +00:00
Willem Jan Palenstijn
4dca30cfe9 reinstate line drawing for xfact/yfact > 1 
svn-id: r38821
 2009-02-23 22:36:39 +00:00
Willem Jan Palenstijn
25738df2d3 SCI: reinstate pointer scaling for xfact/yfact 
svn-id: r38820
 2009-02-23 22:36:19 +00:00
Filippos Karapetis
e7fd931afa Replaced lineColor2 with Graphics::drawLine 
svn-id: r38813
 2009-02-23 09:39:09 +00:00
Filippos Karapetis
5e1ab5be9b Replaced get_uint_16() with READ_LE_UINT16() 
svn-id: r38812
 2009-02-23 09:03:12 +00:00
Max Horn
376e4f86d6 SCI: cleanup 
svn-id: r38811
 2009-02-23 04:48:29 +00:00
Max Horn
c21e6c382d SCI: Moved file specific stuff from tools.h & tools.cpp to kfile.cpp 
svn-id: r38810
 2009-02-23 04:37:35 +00:00
Max Horn
152ed65c50 SCI: Don't chdir to the gamepath anymore 
svn-id: r38809
 2009-02-23 04:36:40 +00:00
Max Horn
094c3264a0 SCI: Added some demos (they don't work, so disabled for now. Would be way cool if all demos worked, for testing) 
svn-id: r38808
 2009-02-23 04:35:06 +00:00
Max Horn
2413a5690e SCI: Got rid of resource_dir & work_dir (temporarily disabled f_open_mirrored for that) 
svn-id: r38807
 2009-02-23 04:31:11 +00:00
Max Horn
6147bd3ed9 SCI: Merged kDeviceInfo_Win32 & kDeviceInfo_Unix; added lots of debug calls to the file I/O code, to make it possible to analyze usage patterns; some cleanup 
svn-id: r38806
 2009-02-23 03:51:22 +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
Walter van Niftrik
ce7377ff5b SCI: Fix incorrect usage of struct tm in date function of kGetTime 
svn-id: r38803
 2009-02-23 01:59:04 +00:00
Filippos Karapetis
0c8d8b20d9 Updated comment 
svn-id: r38801
 2009-02-23 00:40:59 +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
Jordi Vilalta Prat
81c6da5658 SCI: Fix saving/loading (regression introduced in r38767) 
svn-id: r38799
 2009-02-23 00:14:51 +00:00
Matthew Hoops
5cc8d71cac Ms. Astro Chicken! (aka Add detection for Ms. Astro Chicken) 
svn-id: r38797
 2009-02-22 23:32:28 +00:00
Willem Jan Palenstijn
a5a29a44e9 Check for end of file more often while reading CFSML 
svn-id: r38796
 2009-02-22 22:07:30 +00:00
Max Horn
4c1349e0f4 SCI: Fix what looks like a bug in the save/load system (?) 
svn-id: r38795
 2009-02-22 21:41:00 +00:00
Max Horn
1687a5e8d0 SCI: Rewrite the way file handles are managed 
svn-id: r38794
 2009-02-22 21:38:46 +00:00
Max Horn
4a6d6e8988 SCI: Moved the code which iterates over the current dir into a small class 
svn-id: r38793
 2009-02-22 20:48:42 +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
8997a45773 SCI: Replaced two uses of sci_fopen by Common::File; moved is_print_str() to the only spot it is used 
svn-id: r38791
 2009-02-22 19:45:53 +00:00
Matthew Hoops
a5e6684151 Re-enable kq1 SCI Amiga and Mixed Up Mother Goose SCI Amiga. 
svn-id: r38789
 2009-02-22 18:31:40 +00:00
Matthew Hoops
20eb924bb1 Add Cascade Quest and the SCI Companion Template (fan games) 
svn-id: r38788
 2009-02-22 17:54:38 +00:00
Matthew Hoops
8fb7fd0681 Add detection entries for the SCI Fangames. 
svn-id: r38785
 2009-02-22 14:40:56 +00:00
Jordi Vilalta Prat
b5ce8d9320 Whitespace cleanup 
svn-id: r38783
 2009-02-22 13:11:43 +00:00
Jordi Vilalta Prat
ac409a2ab7 SCI: Converted "segment interfaces" into classes 
svn-id: r38782
 2009-02-22 12:18:22 +00:00
Andre Heider
7d21acd18b replace sci_gettime in gfx/ 
svn-id: r38781
 2009-02-22 10:20:45 +00:00
Max Horn
d9a98ddc21 SCI: cleanup 
svn-id: r38779
 2009-02-22 04:22:53 +00:00
Max Horn
a4968c1cf6 SCI: Resolve FIXME in decompression code 
svn-id: r38778
 2009-02-22 04:04:33 +00:00
Travis Howell
edc73529af Add resource version option to game detection table, for games version(s) with undetected/unexpected resource types. 
svn-id: r38776
 2009-02-22 03:40:51 +00:00
Filippos Karapetis
fcf5e87de6 - Made ResourceManager accessible from _vm 
- Replaced c_version by its corresponding ScummVM equivalent command

svn-id: r38775
 2009-02-22 01:33:16 +00:00
Matthew Hoops
85fe96b72d Add remapping of Amiga version strings and re-enable detection of kq5 amiga. 
svn-id: r38774
 2009-02-22 01:11:06 +00:00
Filippos Karapetis
a46a2d9c92 Fixed compilation under Windows 
svn-id: r38770
 2009-02-22 00:38:39 +00:00
Jordi Vilalta Prat
817fde6cdd SCI: Convert the segment manager into a class 
svn-id: r38767
 2009-02-21 23:27:24 +00:00
Willem Jan Palenstijn
b18ccb755a multiply before dividing to improve timer resolution 
svn-id: r38765
 2009-02-21 23:16:03 +00:00
Max Horn
ebc3de4a82 cleanup 
svn-id: r38764
 2009-02-21 22:59:50 +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
6f13850161 SCI: Moved include/menubar.h -> gfx/menubar.h, untangled headers some more 
svn-id: r38761
 2009-02-21 22:50:35 +00:00
Max Horn
d6e397233f SCI: More cleanup 
svn-id: r38758
 2009-02-21 22:40:58 +00:00
Joost Peters
41b1f19a5d add entries for my SQ4CD, SQ6CD, LSL6CD and LSL7 versions 
svn-id: r38757
 2009-02-21 22:38:17 +00:00
Willem Jan Palenstijn
145d5c4493 fix hang on 64bit platforms 
svn-id: r38756
 2009-02-21 22:35:35 +00:00
Max Horn
b18c96ca87 SCI: Replaced evil MIDI_WRITER_BODY with C++ subclassing; some compile fixes to currently unused files 
svn-id: r38755
 2009-02-21 22:14:26 +00:00
Joost Peters
a84e6c89ac re-add PQ3 & PQ4 from the PQ collection 
svn-id: r38754
 2009-02-21 22:13:59 +00:00
Max Horn
8430b662a9 SCI: Changed typedef struct -> struct 
svn-id: r38752
 2009-02-21 22:06:42 +00:00
Joost Peters
da190b30fc re-add LSL1VGA, LSL2, LSL5 and LSL6 from the LSL collection with the correct SCI version 
svn-id: r38751
 2009-02-21 22:03:58 +00:00
Andre Heider
9ce5092be4 substituted some more sci_gettime 
svn-id: r38749
 2009-02-21 22:00:24 +00:00
Max Horn
dbafa5c456 SCI: Removed c_sleep console command (what was/is the idea behind that one, anyway?) 
svn-id: r38748
 2009-02-21 21:22:50 +00:00
Max Horn
6288e0456f SCI: Removed setjmp code 
svn-id: r38747
 2009-02-21 21:22:07 +00:00
Max Horn
ff17899d8e SCI: Got rid of include/scitypes.h 
svn-id: r38746
 2009-02-21 21:16:41 +00:00
Max Horn
2acb44d157 SCI: Changed WRITE_UINT16 -> WRITE_LE_UINT16 and READ_UINT16 -> READ_LE_UINT16 (oops) 
svn-id: r38745
 2009-02-21 21:07:51 +00:00
Willem Jan Palenstijn
7570cfcb57 use LE functions for getInt16/putInt16 
svn-id: r38744
 2009-02-21 21:05:16 +00:00
Max Horn
041869ed36 SCI: Untangling #include dependencies a bit 
svn-id: r38740
 2009-02-21 19:54:15 +00:00
Max Horn
05107eaac1 SCI: Changed getUInt16->READ_UINT16 and putInt16->WRITE_UINT16 in scicore/decompress01.cpp 
svn-id: r38738
 2009-02-21 19:52:40 +00:00
Eugene Sandulenko
c6e27ebfcd Fix compilation by implicit including of sys/stat.h 
svn-id: r38736
 2009-02-21 19:35:30 +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
Max Horn
1bbde7be4e SCI: Changed decompressors to take advantage of Common::ReadStream::readUint16LE; cleanup 
svn-id: r38733
 2009-02-21 19:27:06 +00:00
Andre Heider
c9793552af replace sci_gettime 
svn-id: r38730
 2009-02-21 19:16:38 +00:00
Max Horn
6f022278e6 SCI: Removed unused header 
svn-id: r38729
 2009-02-21 19:06:34 +00:00
Max Horn
f00f020d08 SCI: Moved sci_dir_t and GTimeVal to tools.h 
svn-id: r38728
 2009-02-21 19:04:27 +00:00
Max Horn
c5e00f3de2 SCI: More cleanup 
svn-id: r38725
 2009-02-21 19:01:32 +00:00
Filippos Karapetis
6bb73e3b68 Fixed startup of my floppy version of SQ4 
svn-id: r38724
 2009-02-21 18:58:32 +00:00
Filippos Karapetis
9260fd38b8 Fixed compilation under MSVC 
svn-id: r38723
 2009-02-21 18:56:17 +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
b6c9b12e64 SCI: Got rid of sci_sched_yield 
svn-id: r38719
 2009-02-21 18:21:00 +00:00
Max Horn
273271767b When using error, no need to add a trailing newline 
svn-id: r38718
 2009-02-21 18:20:40 +00:00
Filippos Karapetis
6acf734ab8 Oops 
svn-id: r38717
 2009-02-21 18:17:08 +00:00
Filippos Karapetis
426def4f44 Turned back all fprintf/exit(1) bits into error() 
svn-id: r38716
 2009-02-21 18:16:17 +00:00
Max Horn
11b2ddfc54 SCI: Simplified gcd (and fixed crash when a = 0, not that it would be relevant ;) 
svn-id: r38715
 2009-02-21 18:13:03 +00:00
Filippos Karapetis
3cd9706c63 Now that we've placed everything under the Sci namespace, the Sci:: bits can be removed 
svn-id: r38714
 2009-02-21 18:12:02 +00:00
Max Horn
199121a04e SCI: Replaced sci_sched_yield based 'mutex' in SCI mixer by a regular ScummVM mutex 
svn-id: r38713
 2009-02-21 18:06:00 +00:00
Paweł Kołodziejski
a5cf6bfd85 cleanup 
svn-id: r38712
 2009-02-21 17:29:03 +00:00
Paweł Kołodziejski
f18d5500b1 formating 
svn-id: r38709
 2009-02-21 17:23:28 +00:00
Willem Jan Palenstijn
a0cc744aab fix translation of shift-F-keys too 
svn-id: r38708
 2009-02-21 17:15:26 +00:00
Willem Jan Palenstijn
dc446169ba fix translation of F-keys 
svn-id: r38707
 2009-02-21 17:13:05 +00:00
Paweł Kołodziejski
d23166c2a1 formating 
svn-id: r38706
 2009-02-21 16:20:53 +00:00
Paweł Kołodziejski
1ee65390cd formating 
svn-id: r38705
 2009-02-21 16:08:04 +00:00
Joost Peters
709d98be7c GFX_ERROR messages need \n 
svn-id: r38704
 2009-02-21 16:07:51 +00:00