Commit Graph

9510 Commits

Author SHA1 Message Date
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
59b374505f Fixed weirdness in groovie (as reported on scummvm-devel)
svn-id: r39109
2009-03-04 06:08:30 +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
Johannes Schickel
3a35b5b5f2 - Make Lands of Lore compileable optionally as suggested by _sev. (via ENABLE_LOL define)
- Change default build system to support LoL as a subengine of KYRA. LoL is currently disabled by default.

(- Minor enum name fixes for Lands of Lore code.)

svn-id: r39099
2009-03-04 00:45:34 +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
Florian Kagerer
3f2af1e8a1 LOL: implemented some walking code for the monsters
svn-id: r39097
2009-03-03 22:32:39 +00:00
Fabio Battaglia
1956c1c68f Added missing checkCd() execution when loading through GMM
svn-id: r39096
2009-03-03 21:33:45 +00:00
Fabio Battaglia
7fc8bb81a7 Enabled and hopefully fixed GMM saving/loading for sword1
svn-id: r39095
2009-03-03 20:05:00 +00:00
Torbjörn Andersson
ea4f25fd30 Renamed parameter to silence warning.
svn-id: r39094
2009-03-03 19:49:50 +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
Fabio Battaglia
5f13e5ebcd Cleaned up some comments
svn-id: r39090
2009-03-03 16:27:56 +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
Paul Gilbert
eb610d66bd Corrected click handling when a text message is displaying to properly dismiss the text, rather than trying to immediately perform another action
svn-id: r39088
2009-03-03 11:08:03 +00:00
Paul Gilbert
f3a9274a45 Changed the int16[5] array used in pathfinding to a structure with explicitly named fields
svn-id: r39087
2009-03-03 10:10:35 +00:00
Paul Gilbert
236b42bcff Formatting fixes
svn-id: r39086
2009-03-03 09:00:49 +00:00
Fabio Battaglia
0077889eeb Add playtime feature support to sword1
svn-id: r39083
2009-03-02 22:37:09 +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
Nicola Mettifogo
040da3353f Marked PUT, PRINT and WAIT commands as not used in the scripts of BRA (thus they won't be implemented).
svn-id: r39075
2009-03-02 15:31:07 +00:00
Fabio Battaglia
2913a561cc Avoid using unnecessary buffers in psxShrinkedBackgroundToIndexed
svn-id: r39074
2009-03-02 13:46:50 +00:00
Nicola Mettifogo
11a49681e4 Implemented 'open', 'close' and 'leave' commands.
svn-id: r39073
2009-03-02 11:58:40 +00:00
Fabio Battaglia
ed65593bb3 Avoid using unnecessary buffers in psxBackgroundToIndexed
svn-id: r39072
2009-03-02 11:30:23 +00:00
Fabio Battaglia
0233202150 Formatting changes in older PSX related functions
svn-id: r39071
2009-03-02 11:12:41 +00:00
Fabio Battaglia
08a2de9447 Changed the way Broken Sword PSX parallax are handled to improve speed
svn-id: r39070
2009-03-02 10:59:14 +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
Nicola Mettifogo
310036788a Enabled walking delay for follower animation.
svn-id: r39067
2009-03-02 09:16:03 +00:00
Paul Gilbert
2d9705311e Bugfix for frequent freezes when doing actions - the main movement state switch statement was actually relying on falling through case statements to work properly
svn-id: r39066
2009-03-02 09:14:36 +00:00
Nicola Mettifogo
f1044e85b2 Fixed selection of zone and animation for removal in BRA. This enables the follower animation to follow the main character across location switches.
svn-id: r39065
2009-03-02 08:44:30 +00:00
Nicola Mettifogo
33a8fe7a7e Initialize and save zones flags and follower position when a location switch occurs.
svn-id: r39064
2009-03-02 08:36:42 +00:00
Paul Gilbert
da6315bb4c Formatting fixes, and added extra constants and function name corrections
svn-id: r39063
2009-03-02 08:32:38 +00:00
Nicola Mettifogo
813bd1ac7a Fixed overflow in flag table.
svn-id: r39062
2009-03-02 06:14:25 +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
Kostas Nakos
f509f65023 add virtual keyboard backend hints for savegame name
svn-id: r39056
2009-03-01 21:54:53 +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
Kostas Nakos
a718713925 only center vertically in DW2
svn-id: r39052
2009-03-01 21:03:46 +00:00
Florian Kagerer
b42b7a8b40 LOL: implement some opcodes for dialogue sequences
svn-id: r39051
2009-03-01 20:37:57 +00:00
Kostas Nakos
bf894deb06 silence compiler warnings: the names of some tinsel defines were shadowing standard winapi defines
svn-id: r39049
2009-03-01 19:46:07 +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
Torbjörn Andersson
f20554d389 Check for "track01" as well as "track1". (I hope I didn't break compilation by
modifying Windows-only code.)

svn-id: r39040
2009-03-01 15:15:51 +00:00
Florian Kagerer
7ea5cefef4 LOL: implemented some monster related code (monsters now get placed in the maze, but they still don't do anything)
svn-id: r39039
2009-03-01 14:45:30 +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
Torbjörn Andersson
3429c17ac4 Removed some (the last?) remains of the BS1 MPEG cutscene player.
svn-id: r39032
2009-03-01 12:00: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
Travis Howell
fdb9cd9ce2 Add DOS demo of Elvira 1.
svn-id: r39026
2009-03-01 10:09:27 +00:00
Jordi Vilalta Prat
c9d440bf5b Remove extra whitespaces
svn-id: r39024
2009-03-01 09:17:05 +00:00
Jordi Vilalta Prat
e5e733781e Groovie: Merged init() and go() into run()
svn-id: r39023
2009-03-01 09:12:32 +00:00
Paul Gilbert
ecb6b7bf54 Added an explicit clearing of all animation fields for new animations - this fixes a problem where the player could disappear if he had to rotate to face a selected object
svn-id: r39019
2009-03-01 08:28:10 +00:00
Travis Howell
b08c22b283 Fix bottom palette in AtariST version of Elvira 2.
svn-id: r39014
2009-03-01 07:14:13 +00:00
Travis Howell
3571da7a94 Correctly fix position of icons in AtariST version of Elvira 2.
svn-id: r39011
2009-03-01 06:43:46 +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
Travis Howell
9ffd6a8768 Fix regression in AppleII/C64 versions of Maniac Mansion.
svn-id: r38999
2009-03-01 03:45:42 +00:00
Johannes Schickel
3b16073a38 Fix warnings.
svn-id: r38997
2009-03-01 03:31:52 +00:00
Paul Gilbert
3fb5e15072 Formatting fixes
svn-id: r38996
2009-03-01 02:25:46 +00:00
Paul Gilbert
57c7593325 Implemented proper support for the Pause 'p' key
svn-id: r38995
2009-03-01 02:20:22 +00:00
Paul Gilbert
aa34628713 Cleaned up parts of the font display system. Note: Cruise used two almost identical routines for text display - one which creates a draw structure, and the other draws directly to the screen. Since there don't seem to be any other differences, the immediate draw version has been changed to use the rendering version and then draw the results
svn-id: r38994
2009-03-01 02:19:06 +00:00
Paul Gilbert
c51d5835a0 Moved mouse cursor definition data into staticres.cpp
svn-id: r38993
2009-03-01 02:16:44 +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
Gregory Montoir
478fa21838 fix for tracker item #2628896 TUCKER: Invisible Raincoat bug
svn-id: r38991
2009-03-01 00:51:59 +00:00
Gregory Montoir
40a2485050 fix for tracker item #2627942 TUCKER: Brainroom/Information Room Graphics glitch
svn-id: r38990
2009-03-01 00:51:14 +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
Lars Persson
4f3a50913e Added keyboard mapping for global menu.
svn-id: r38981
2009-02-28 21:05:21 +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
Paul Gilbert
d3b2a4ede9 Fixed MSVC compiler warning
svn-id: r38960
2009-02-28 11:09:38 +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
Sven Hesse
78f28d3f30 Shutting up a compiler warning
svn-id: r38958
2009-02-28 10:58:46 +00:00
Eugene Sandulenko
440fcb1d5a Patch #2638336: Broken Sword PSX Support Part 2 of 2
svn-id: r38957
2009-02-28 10:53:45 +00:00
Eugene Sandulenko
5aa50ec889 Patch #2638336: Broken Sword PSX Support
svn-id: r38956
2009-02-28 10:46:33 +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
Nicola Mettifogo
4bd19f7a7f Improved debug output when listing animations.
svn-id: r38948
2009-02-28 06:21:24 +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
Travis Howell
c1a712c4e8 Add German font data table for German versions of Elvira 2 and Waxworks.
svn-id: r38943
2009-02-28 00:13:14 +00:00
Travis Howell
0315465fde Elvira 1 uses slightly different font data table, shared for all languages.
svn-id: r38942
2009-02-28 00:12:21 +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
Matthew Hoops
9a89280527 Add detection of another version of the Black Cauldron. (See bug #2628354).
svn-id: r38936
2009-02-27 22:14:18 +00:00
Travis Howell
5974452291 Fix bug #2642654 - SIMON2: Cannot load savegame, also in CD DOS?.
svn-id: r38935
2009-02-27 22:10:25 +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
Nicola Mettifogo
44906f574f The engine has now to build the drawing list for the graphic department, instead of setting visibility flags; the new field _prog has been added to GfxObj to help sorting the list.
The outcome is that cleaning up unused resources on location switches is now easier to manage, and less error prone.

svn-id: r38928
2009-02-27 08:56:19 +00:00
Nicola Mettifogo
e17a140019 Improved debugger output.
svn-id: r38927
2009-02-27 08:46:39 +00:00
Torbjörn Andersson
53572f6c07 Committed patch #2606844 ("Fix crash when using BS1 without portuguese data").
Admittedly, I'm not really that familiar with BS1 resource management, but as
far as I can tell the patch just adds sanity checking, so it shouldn't hurt.

svn-id: r38925
2009-02-27 05:52:22 +00:00
Torbjörn Andersson
349fce7454 Committed a slightly updated patch #2602772 ("Patches for BS1 bug ID #1977094")
to replace some missing subtitles with hard-coded ones.

svn-id: r38923
2009-02-27 05:20:37 +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
Nicola Mettifogo
09196a35ad Added filter to preserve needed Animation across location switch.
svn-id: r38903
2009-02-26 14:53:57 +00:00
Nicola Mettifogo
b76ad3dc4f changeLocation now uses the internal variable _newLocationName instead of an input parameter.
svn-id: r38902
2009-02-26 14:42:03 +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
Nicola Mettifogo
88efc8603e Removed null*Ptr dummy objects, using SharedPtr's reset method to null pointers instead.
svn-id: r38897
2009-02-26 10:44:01 +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
Nicola Mettifogo
76283e3f73 Merged walk code for NS, and simplified handling.
svn-id: r38894
2009-02-26 09:42:08 +00:00
Nicola Mettifogo
3efffe511b Fixed crashes and leaks when quitting BRA from menu and splash screen.
svn-id: r38893
2009-02-26 09:12:29 +00:00
Nicola Mettifogo
d5d006bb30 Cleanup of CommandExec and ProgramExec, and pushed down dependencies from exec.h.
svn-id: r38892
2009-02-26 06:16:35 +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
Nicola Mettifogo
301e9d73d1 * Rebased Parallaction_br to inherit from Parallaction instead of Parallaction_ns
* Same as above for CommandExec_br and ProgramExec_br
This should finally kill most issues with destruction, at the cost of some code duplication.

svn-id: r38877
2009-02-25 09:15:53 +00:00
Nicola Mettifogo
93666ef53c Updated all for(;;) loops to use prefix increment on iterators.
svn-id: r38876
2009-02-25 08:53:58 +00:00
Nicola Mettifogo
8ba9e804a8 Fixed segfault when quitting BRA.
svn-id: r38875
2009-02-25 03:52:16 +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
Nicola Mettifogo
b3d2429b04 Fixed shadowed name.
svn-id: r38841
2009-02-24 15:21:53 +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
Nicola Mettifogo
6334125d1c Implemented follower support, except that:
* follower is forgotten when location changes (see freeLocation)
* the final walking frame is screwed

svn-id: r38838
2009-02-24 11:20:45 +00:00
Nicola Mettifogo
5dff53a2fa Added preliminary code for following walker support in BRA.
svn-id: r38837
2009-02-24 09:18:20 +00:00
Nicola Mettifogo
659c9fb901 Changed interface to walk code, to better handle the differences between games. Moreover:
* merged PathBuilder_BR into PathWalker_BR
* implemented checkTrap routine for BRA

svn-id: r38836
2009-02-24 08:42:46 +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