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
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
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
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
25e7d3a08d
SCI: Renamed some sfx header files
...
svn-id: r39006
2009-03-01 06:02:17 +00:00
Greg Frieger
ce42d6e538
Fixed windows and text drawing problem in SCI1
...
svn-id: r39000
2009-03-01 04:07:04 +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
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
Andre Heider
b2cd5beb9e
clean up some warnings
...
svn-id: r38965
2009-02-28 13:41:43 +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
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
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
e140188541
SCI: Some nitpick FIXMEs on incorrect opcode number comments ;)
...
svn-id: r38906
2009-02-26 16:16:30 +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
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
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
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
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
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
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
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
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
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
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
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
Jordi Vilalta Prat
81c6da5658
SCI: Fix saving/loading (regression introduced in r38767)
...
svn-id: r38799
2009-02-23 00:14:51 +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
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
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
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
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
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
Max Horn
8430b662a9
SCI: Changed typedef struct -> struct
...
svn-id: r38752
2009-02-21 22:06:42 +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
041869ed36
SCI: Untangling #include dependencies a bit
...
svn-id: r38740
2009-02-21 19:54:15 +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
6f022278e6
SCI: Removed unused header
...
svn-id: r38729
2009-02-21 19:06:34 +00:00
Max Horn
c5e00f3de2
SCI: More cleanup
...
svn-id: r38725
2009-02-21 19:01: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
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
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
Andre Heider
e514d9780a
use OSystem::getMillis() for last_wait_time and get rid of game_start_time
...
svn-id: r38701
2009-02-21 15:40:14 +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
Travis Howell
7ce7993c30
Remove excess \n.
...
svn-id: r38695
2009-02-21 13:19:44 +00:00
Joost Peters
177c4169d1
error() calls don't need \n, as it is already appended in error() itself
...
svn-id: r38694
2009-02-21 12:58:09 +00:00
Andre Heider
1cbe5c327d
replace obsolete creat() with open()
...
svn-id: r38690
2009-02-21 12:26:10 +00:00
Joost Peters
3988062776
replace #ifdef WORDS_BIGENDIAN by SCUMM_BIG_ENDIAN
...
svn-id: r38689
2009-02-21 12:21:15 +00:00
Willem Jan Palenstijn
baa7c7b997
remove some endlines from warning() calls
...
svn-id: r38683
2009-02-21 11:26:54 +00:00
Jordi Vilalta Prat
d8d6aaa461
Replaced "typedef struct _seg_manager_t seg_manager_t" with "struct SegManager"
...
svn-id: r38679
2009-02-21 11:04:47 +00:00
Jordi Vilalta Prat
3cc6cdf719
Replaced "typedef struct _state state_t" with "struct EngineState"
...
svn-id: r38678
2009-02-21 10:47:56 +00:00
Oystein Eftevaag
25f7c37171
Wrapped the SCI engine in the Sci namespace.
...
svn-id: r38676
2009-02-21 10:23:36 +00:00
Max Horn
fa75bd23e6
SCI: Yet more cleanup
...
svn-id: r38661
2009-02-21 04:43:49 +00:00
Max Horn
7c87b4901d
SCI: Use GCC_PRINTF hint to the compiler for _SCIkprintf and sciprintf; fixed tons of bad format strings
...
svn-id: r38660
2009-02-21 04:25:56 +00:00
Max Horn
cb6b1fc903
SCI: Regenerated said.cpp from said.y
...
svn-id: r38659
2009-02-21 04:23:43 +00:00
Max Horn
bcb1a71052
SCI: Fixed more warnings
...
svn-id: r38658
2009-02-21 04:10:21 +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
Max Horn
c8ea2dce5f
SCI: Fixed more warnings
...
svn-id: r38656
2009-02-21 03:32:13 +00:00
Max Horn
031e3e3b90
SCI: Fixed tons of bugs in error/warning format strings
...
svn-id: r38655
2009-02-21 03:25:23 +00:00
Willem Jan Palenstijn
7bc4b8667e
avoid vsscanf
...
svn-id: r38651
2009-02-21 00:18:02 +00:00
Willem Jan Palenstijn
abbca80d61
Converted SCI saving to use saveFileMan. Instead of a savegame being
...
a directory with an id and a state file, a savegame now consists of
two consecutive CFSML-serialized structs: SavegameMetadata and state_t.
The former contains the savegame title, and is loaded when scanning saves.
svn-id: r38649
2009-02-20 23:41:15 +00:00
Travis Howell
f6b4c2544b
Switch errors back to warnings, to fix SCI 1.1 regressions.
...
svn-id: r38646
2009-02-20 23:26:30 +00:00
Paweł Kołodziejski
fc28525969
formating
...
svn-id: r38640
2009-02-20 23:09:29 +00:00
Paweł Kołodziejski
dbb81ab516
formating
...
svn-id: r38636
2009-02-20 22:32:56 +00:00
Paweł Kołodziejski
037f56f719
formating
...
svn-id: r38635
2009-02-20 22:29:49 +00:00
Filippos Karapetis
701279fb40
Changed some SCIkdebug() calls to debugC()
...
svn-id: r38634
2009-02-20 22:21:33 +00:00
Paweł Kołodziejski
77542e8623
formating
...
svn-id: r38628
2009-02-20 22:12:48 +00:00
Paweł Kołodziejski
435844c61e
formating
...
svn-id: r38625
2009-02-20 21:38:38 +00:00
Paweł Kołodziejski
8a15a72ec8
formating
...
svn-id: r38622
2009-02-20 20:55:35 +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
1419024bd0
formating
...
svn-id: r38620
2009-02-20 20:33:27 +00:00
Paweł Kołodziejski
75b91c71dd
restored formating
...
svn-id: r38619
2009-02-20 20:31:08 +00:00
Paweł Kołodziejski
61b9086fcf
formating
...
svn-id: r38618
2009-02-20 20:17:57 +00:00
Filippos Karapetis
ac716ad843
Started conversion of debug messages and debug levels to the ScummVM equivalents. Removed the "stubs" and "warnings" debug levels and replaced such kinds of messages with normal warnings
...
svn-id: r38617
2009-02-20 20:11:12 +00:00
Paweł Kołodziejski
2080166499
formating
...
svn-id: r38616
2009-02-20 20:01:31 +00:00
Willem Jan Palenstijn
7fdf8021d8
use new instead of malloc for int_hash_map_t
...
svn-id: r38613
2009-02-20 19:32:27 +00:00
Paweł Kołodziejski
08cd2c8806
formating
...
svn-id: r38612
2009-02-20 19:08:38 +00:00
Paweł Kołodziejski
947a296d33
formating
...
svn-id: r38607
2009-02-20 17:23:54 +00:00
Paweł Kołodziejski
b70f3ba603
formating
...
svn-id: r38605
2009-02-20 17:09:22 +00:00
Paweł Kołodziejski
61231c2a36
formating
...
svn-id: r38604
2009-02-20 17:05:47 +00:00
Paweł Kołodziejski
ac4fe7a4bc
formating
...
svn-id: r38603
2009-02-20 16:59:05 +00:00
Paweł Kołodziejski
75f9d5457a
formating
...
svn-id: r38601
2009-02-20 16:30:22 +00:00
Paweł Kołodziejski
f4719cf79c
formating
...
svn-id: r38600
2009-02-20 16:22:09 +00:00
Paweł Kołodziejski
5066e2c4be
formating
...
svn-id: r38598
2009-02-20 16:18:08 +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
7422e98f8f
SCI: Added TODO suggestion to change the vm opcode switch/case to an opcode table with methods for each opcode (helps to separate code and deal with changed opcode numbering in other SCI versions)
...
svn-id: r38594
2009-02-20 15:44:22 +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
Paweł Kołodziejski
65f92d6525
formating
...
svn-id: r38564
2009-02-19 20:50:55 +00:00
Paweł Kołodziejski
427196cde4
formating
...
svn-id: r38560
2009-02-19 18:52:00 +00:00
Paweł Kołodziejski
7beba8edc9
formating
...
svn-id: r38558
2009-02-19 18:40:03 +00:00
Paweł Kołodziejski
c6e9e3d9bc
formating
...
svn-id: r38557
2009-02-19 18:33:43 +00:00
Paweł Kołodziejski
ade3c8f565
formating
...
svn-id: r38556
2009-02-19 18:11:05 +00:00
Paweł Kołodziejski
4e052e4d1c
formating
...
svn-id: r38555
2009-02-19 18:08:44 +00:00
Paweł Kołodziejski
352802bba6
formating
...
svn-id: r38554
2009-02-19 18:02:51 +00:00
Paweł Kołodziejski
2f2f262062
formating
...
svn-id: r38538
2009-02-19 08:44:53 +00:00
Paweł Kołodziejski
8ca98d41a2
formating
...
svn-id: r38537
2009-02-19 08:43:28 +00:00
Paweł Kołodziejski
288445abb2
formating
...
svn-id: r38512
2009-02-18 22:46:01 +00:00
Paweł Kołodziejski
b500162ea9
formating
...
svn-id: r38511
2009-02-18 22:41:57 +00:00
Filippos Karapetis
7dfb902019
Updated the savegame.cfsml file to remove unused functions and generated the appropriate .cpp file using the cfsml tool
...
svn-id: r38493
2009-02-18 17:57:57 +00:00
Eugene Sandulenko
802f28b963
move cfsml.pl to the tools/ directory
...
svn-id: r38486
2009-02-18 15:06:24 +00:00
Eugene Sandulenko
8dc171afa9
restore removed files
...
svn-id: r38485
2009-02-18 15:05:00 +00:00
Eugene Sandulenko
af3eb953b2
Adding the files properly. Part1
...
svn-id: r38483
2009-02-18 14:57:03 +00:00
Filippos Karapetis
4c406e69ee
Added missing file savegame.cfsml (hopefully, compilation should REALLY be fixed now, sorry again...)
...
svn-id: r38481
2009-02-18 14:28:32 +00:00
Filippos Karapetis
9658836f5d
Reverting commits which moved cfsml.pl and said.y, part 2
...
Hopefully, compilation should be fixed again
svn-id: r38479
2009-02-18 14:08:21 +00:00
Filippos Karapetis
1b81383dcb
Removed files which are not part of the SCI engine (will be moved to /tools, together with the others)
...
svn-id: r38468
2009-02-18 11:14:05 +00:00
Filippos Karapetis
1db017a6c2
Removed the cfsml.pl tool from the SCI engine (eventually, it should go to /tools, together with the other ones...)
...
svn-id: r38467
2009-02-18 11:03:44 +00:00
Filippos Karapetis
1ccedde91a
Disabled unused functions
...
svn-id: r38465
2009-02-18 10:37:22 +00:00
Filippos Karapetis
53ef1bd4fd
Removed already implemented graphic capability flags, and used CLIP inside scummvm_draw_line() to clean up the code a bit
...
svn-id: r38451
2009-02-17 22:53:09 +00:00
Paweł Kołodziejski
4a241753c4
fixed compiler warning about potentialy uninitialized variable
...
svn-id: r38446
2009-02-17 20:43:37 +00:00
Paweł Kołodziejski
4fcbc4f712
fixed unsigned/signed comparisons warnings
...
svn-id: r38445
2009-02-17 20:34:19 +00:00
Paweł Kołodziejski
ebff01c463
shat up ARRAYSIZE redefine compiler warnings
...
svn-id: r38444
2009-02-17 20:26:57 +00:00
Filippos Karapetis
e28439bebc
point_t -> Common::Point
...
svn-id: r38437
2009-02-17 19:15:37 +00:00
Max Horn
e77e56bec1
Revert changed I accidentally commited *sigh*
...
svn-id: r38435
2009-02-17 18:21:27 +00:00
Max Horn
471f630c2e
SCI: Moved sfx_pcm_urat_t from include/sfx_pcm.h to sfx/mixer.h
...
svn-id: r38434
2009-02-17 18:17:01 +00:00
Eugene Sandulenko
22a009d3c6
Update headers. engine/
...
svn-id: r38408
2009-02-17 15:02:16 +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
Filippos Karapetis
a3adca29f2
Removed a lot of unused and compiler-specific debug code. Note that for MSVC, the corresponding checks are enabled by default in the debug build, so there's no need to set them again programmatically. Also, removed the "codebugging" related code
...
svn-id: r38387
2009-02-16 23:28:24 +00:00
Filippos Karapetis
6ec40aa9f6
Removed unused code and defines
...
svn-id: r38385
2009-02-16 22:45:23 +00:00
Lars Persson
6dbd7e21eb
Use MIN with correct template <int>
...
svn-id: r38375
2009-02-16 18:37:28 +00:00
Filippos Karapetis
4fdd92c610
Fixed compilation
...
svn-id: r38364
2009-02-16 10:52:45 +00:00
Max Horn
a272626210
Replace strncasecmp by scumm_strnicmp
...
svn-id: r38362
2009-02-16 09:53:34 +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
0e3692dbc7
SCI: Moved seg_manager.*, int_hashmap.* to sci/engine (they are only used there); merged hashmap and int_hashmap
...
svn-id: r38358
2009-02-16 09:23:58 +00:00
Willem Jan Palenstijn
56894d00ef
replace one more instance of strcasecmp by scumm_stricmp
...
svn-id: r38357
2009-02-16 09:21:36 +00:00
Travis Howell
2d0a897d16
Replace strcasecmp with scumm_stricmp.
...
svn-id: r38356
2009-02-16 09:17:49 +00:00
Paweł Kołodziejski
2a7d22702c
initialize palette buffers (compiler warning)
...
svn-id: r38351
2009-02-16 07:17:36 +00:00
Jordi Vilalta Prat
75a4540791
Revert r38254 as pointed by waltervn (SCI1 games work again)
...
svn-id: r38349
2009-02-16 07:02:11 +00:00
Max Horn
6af056c89d
Reimplemented reg_t_hashmap using Common::HashMap
...
svn-id: r38340
2009-02-16 01:58:30 +00:00
Max Horn
74132ed71a
SCI: cleanup
...
svn-id: r38336
2009-02-16 00:35:22 +00:00
Max Horn
87bfde321f
Fixed more warnings
...
svn-id: r38332
2009-02-15 23:59:29 +00:00
Max Horn
033ade4f5c
Fixed more warnings (and at least one case of uninited data)
...
svn-id: r38331
2009-02-15 23:49:42 +00:00
Max Horn
57434d955f
SCI: Run astyle to make the code be more compliant with our Code Formatting Guidelines: engine dir
...
svn-id: r38317
2009-02-15 22:28:12 +00:00
Max Horn
4eff1002f9
SCI: Got rid of a nasty hack where class, delete, new were re#defined because FreeSCI used these C++ keywords for variable names
...
svn-id: r38312
2009-02-15 22:01:09 +00:00
Oystein Eftevaag
7a72318a12
Compile fix for OS X
...
svn-id: r38309
2009-02-15 21:57:51 +00:00
Filippos Karapetis
6ffc8e4aea
Silenced another warning (disabled an empty switch statement)
...
svn-id: r38308
2009-02-15 21:39:59 +00:00
Willem Jan Palenstijn
3e3f4e450f
close sound when exiting
...
svn-id: r38307
2009-02-15 21:39:17 +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
Max Horn
e29d90be3e
SCI: Fixed more warnings
...
svn-id: r38303
2009-02-15 21:12:21 +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
Max Horn
e28ed6b4c9
SCI: Got rid of HAVE_FNMATCH_H
...
svn-id: r38279
2009-02-15 18:58:10 +00:00
Willem Jan Palenstijn
8392dd3aab
consts
...
svn-id: r38272
2009-02-15 17:26:59 +00:00
Paweł Kołodziejski
9920d40924
fix compilation
...
svn-id: r38271
2009-02-15 17:20:31 +00:00
Filippos Karapetis
06186502b2
Silenced more warnings
...
svn-id: r38267
2009-02-15 16:45:39 +00:00
Willem Jan Palenstijn
faa156c9d5
fix string unmangling (which I broke earlier)
...
svn-id: r38262
2009-02-15 15:51:56 +00:00
Johannes Schickel
7d29bde4ed
Fixed unused variable warnings.
...
svn-id: r38257
2009-02-15 15:24:43 +00:00
Willem Jan Palenstijn
60a913e9dd
typo
...
svn-id: r38256
2009-02-15 15:21:54 +00:00
Filippos Karapetis
8228f3bcb2
Yet more warning fixes
...
svn-id: r38254
2009-02-15 15:15:26 +00:00
Johannes Schickel
bc7e76ec5d
Yet more warning fixes.
...
svn-id: r38253
2009-02-15 15:10:47 +00:00
Johannes Schickel
6c9e4d2004
Fixed more warnings.
...
svn-id: r38251
2009-02-15 15:06:14 +00:00
Willem Jan Palenstijn
a988ed0d0f
moving towards const-correctness of files generating savegame.cpp.
...
svn-id: r38250
2009-02-15 15:00:31 +00:00
Johannes Schickel
e1b36cf2cd
Fixed some warnings.
...
svn-id: r38249
2009-02-15 14:59:03 +00:00
Filippos Karapetis
aa3f10b2fd
Fixed compilation under MSVC, and silenced some more warnings
...
svn-id: r38247
2009-02-15 14:52:51 +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
Filippos Karapetis
25ddb00436
Silenced more warnings
...
svn-id: r38230
2009-02-15 12:23:16 +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
Filippos Karapetis
1dcc6b79c9
Silenced some more warnings
...
svn-id: r38221
2009-02-15 10:29:34 +00:00
Filippos Karapetis
89cad681d7
Silenced some MSVC warnings
...
svn-id: r38218
2009-02-15 10:24:32 +00:00
Travis Howell
5e2def9ca5
Fix mingw compilation.
...
svn-id: r38217
2009-02-15 10:21:22 +00:00
Eugene Sandulenko
c399437479
- Remove unneeded files
...
- Make whole thing finally compilable
svn-id: r38214
2009-02-15 10:10:23 +00:00
Paweł Kołodziejski
25aaf97300
include win32 build too
...
svn-id: r38210
2009-02-15 10:04:29 +00:00
Paweł Kołodziejski
311344b445
fixed msvc9 compilation
...
svn-id: r38208
2009-02-15 09:56:04 +00:00
Eugene Sandulenko
958c72cfe5
Portability fixes
...
svn-id: r38206
2009-02-15 09:35:14 +00:00
Paweł Kołodziejski
11b4bc25dc
revert last define, will be defined in diffrent place
...
svn-id: r38205
2009-02-15 09:34:39 +00:00
Paweł Kołodziejski
c3af1a22d6
define missing strcasecmp for win32
...
svn-id: r38204
2009-02-15 09:23:46 +00:00
Paweł Kołodziejski
2cd61fad4c
fixed include paths
...
svn-id: r38202
2009-02-15 09:13:17 +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
75f4c44fd0
Removing various unused files (backups remain in vendor/sci/, of course)
...
svn-id: r38197
2009-02-15 08:11:58 +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