Max Horn
6a2efdd36d
SCI: cleanup
...
svn-id: r39353
2009-03-12 03:26:58 +00:00
Max Horn
642bad22d8
SCI: Removed most uses of the 'inline' keyword. It is usually better to let the compiler figure out what to inline. As it is, most of these looked as if they were randomly placed ;)
...
svn-id: r39352
2009-03-12 03:26:47 +00:00
Filippos Karapetis
1e29983d8e
Replaced getInt16, getUInt16 and putInt16
...
svn-id: r39189
2009-03-07 16:14:20 +00:00
Max Horn
25e7d3a08d
SCI: Renamed some sfx header files
...
svn-id: r39006
2009-03-01 06:02:17 +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
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
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
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
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
Jordi Vilalta Prat
9784c2dac1
Fix a valgrind warning (free -> delete)
...
svn-id: r38864
2009-02-24 22:25:39 +00:00
Johannes Schickel
cda5d6989b
Fix some warnings.
...
svn-id: r38840
2009-02-24 15:14:15 +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
9744fc615c
SCI: Changed selector name table to a Common::StringList
...
svn-id: r38805
2009-02-23 03:04:52 +00:00
Jordi Vilalta Prat
b5ce8d9320
Whitespace cleanup
...
svn-id: r38783
2009-02-22 13:11:43 +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
Max Horn
8430b662a9
SCI: Changed typedef struct -> struct
...
svn-id: r38752
2009-02-21 22:06:42 +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
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
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
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
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
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
bcb1a71052
SCI: Fixed more warnings
...
svn-id: r38658
2009-02-21 04:10:21 +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
Paweł Kołodziejski
fc28525969
formating
...
svn-id: r38640
2009-02-20 23:09:29 +00:00
Filippos Karapetis
2ddce51a56
Changed more messages to warnings/errors
...
svn-id: r38621
2009-02-20 20:39:02 +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
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
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
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
Max Horn
87bfde321f
Fixed more warnings
...
svn-id: r38332
2009-02-15 23:59:29 +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
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
Eugene Sandulenko
e241843bec
- Remove some unneeded files
...
- Mass rename .c to .cpp
svn-id: r38227
2009-02-15 11:39:07 +00:00