Commit Graph

452 Commits

Author SHA1 Message Date
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