Commit graph

51 commits

Author SHA1 Message Date
Eugene Sandulenko
abea37c9bb
ALL: Update ScummVM project license to GPLv3+ 2021-12-26 18:48:43 +01:00
sluicebox
5d419e320b SCI: Remove extra semicolon 2021-05-18 17:46:41 -06:00
sluicebox
954f5142cb SCI: Implement full kWait behavior
Fixes PQ3 bug #11020
2019-07-21 18:20:07 +03:00
Colin Snover
9a8070da3c SCI: Do some clean-up of event handling system
Convert macros and vars to enums, rename keyboard events in
preparation for adding key up events, clean up unnecessary nested
conditionals, add TODOs for potential future work.
2017-09-27 20:27:33 -05:00
Colin Snover
c8486395fa SCI: Clean up unnecessary delayed restore flags
_delayedRestoreGame is always set and cleared at the same time as
_delayedRestoreGameId, and _delayedRestoreFromLauncher is written
but never read.
2017-04-22 13:01:35 -05:00
Colin Snover
31daa956d6 SCI: Implement bounds-checked reads of game resources 2017-03-27 19:42:31 -05:00
Martin Kiewitz
7aeadba863 SCI: Removed ".data" from SciEvent
Was the ScummVM-system-Keycode, sometimes modified.
Changed Menu/Portrait/Controls32-code to use .character instead.
Cleaned up a bit of code in getScummVMEvent()
2016-02-02 11:33:40 +01:00
Martin Kiewitz
bfba28c335 SCI: implement delayed restore via ScummVM menu
will delay restoring a saved game until the next
 kGetEvent or kWait
also implement aborting playback for kPortrait
 and kShowMovie
2015-04-26 09:08:46 +02:00
Martin Kiewitz
329c9386c6 SCI: improve kPortrait debug support + fix 2014-12-28 00:22:30 +01:00
Martin Kiewitz
381b7592a4 SCI: actor file format, add debug code kPortrait 2014-12-25 00:31:17 +01:00
Filippos Karapetis
9783f0bbd9 SCI: Remove trailing whitespace 2014-10-28 16:17:06 +02:00
Johannes Schickel
8fc7d60feb SCI: Make GPL headers consistent in themselves. 2014-02-18 02:39:37 +01:00
Martin Kiewitz
fd80030f76 SCI: portraits cleanup + show base picture at end 2013-12-24 23:59:22 +01:00
Martin Kiewitz
60de25fb69 SCI: debug code to print out kq6 raw lipsync data 2013-12-18 20:51:50 +01:00
Martin Kiewitz
693d5e6625 SCI: rave support (KQ6 hires portrait lip sync)
Thanks to wjp and [md5] for helping
2013-12-11 08:25:23 +01:00
Filippos Karapetis
fa2ea4fc61 SCI: Add handling for the RAVE resource type, found in KQ6CD
This contains the sync data in the Windows version of KQ6CD.
Note that currently the sync36 resource is 2 bytes bigger
(it contains 2 bytes from the RAVE resource). Some test code
has also been added to dump the RAVE sync resources
2013-12-10 01:41:15 +02:00
Willem Jan Palenstijn
2d1fd3b554 ALL: Fix typo (existant->existent) 2013-02-23 22:07:32 +01:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Filippos Karapetis
75649f8903 SCI: Reset the portrait bitmap to the "closed mouth" state, when skipping dialogs
in the Windows version of KQ6

svn-id: r54983
2010-12-21 07:53:34 +00:00
Filippos Karapetis
9096848e4b SCI: Throttle the invocations of Engine::shouldQuit()
SCI constantly invoked Engine::shouldQuit(), which in
turn called 2 virtual functions. This added a significant
overhead, as this was called constantly without any
throttling whatsoever. Now, the invocation of shouldQuit()
is throttled to be on each frame update (i.e. at a rate of
60fps). Thanks to wjp for profiling this.

svn-id: r52431
2010-08-29 00:39:33 +00:00
Max Horn
a2bcf9ac31 SCI: Rename sciEvent to SciEvent
svn-id: r49960
2010-06-17 23:11:12 +00:00
Max Horn
8e07a1e167 SCI: Moved the event code a little bit around.
* Move sleep() from EventManager to SciEngine
* Rename EventManager methods: get -> getSciEvent, and
  getFromScummVM -> getScummVMEvent
* Make scancode_rows static const
* Turn altify & numlockify from EventManager methods into static
  functions (and comment out the currently unused numlockify)

svn-id: r49959
2010-06-17 23:10:37 +00:00
Martin Kiewitz
b25aba1d1e SCI: SciGui/SciGui32 gone for good...
svn-id: r49860
2010-06-15 15:44:24 +00:00
Martin Kiewitz
af5346e7ab SCI: calling wait() directly and removing it from SciGui
svn-id: r49853
2010-06-15 13:14:23 +00:00
Max Horn
79c9be5d96 Reduce header dependencies
svn-id: r49836
2010-06-15 12:20:03 +00:00
Filippos Karapetis
5cb311ee2c Renamed the SciEvent class to EventManager, to separate it from the sciEvent structure, and removed it from the engine state
svn-id: r49534
2010-06-09 07:59:42 +00:00
Martin Kiewitz
eb2b3f352e SCI: adding upscaled hires mode 640x480 for kq6 and gk1, fixing valgrind error in GfxPortrait class, not using priority anymore when drawing hires cels (shouldnt be needed for kq6)
svn-id: r49040
2010-05-15 14:17:50 +00:00
Martin Kiewitz
c5f94872a7 SCI: kPortrait - correctly jump over offset table to land on raw lipsync data in portrait files
svn-id: r48928
2010-05-04 08:54:07 +00:00
Martin Kiewitz
72c2d360f7 SCI: renamed SciPalette to GfxPalette, Screen to GfxScreen, GfxPalette is now called directly w/o SciGui
svn-id: r47752
2010-01-31 16:21:11 +00:00
Martin Kiewitz
e0d05a482c SCI: changed flags (uint16) to force (bool) for set/merge palette methods
svn-id: r47578
2010-01-26 22:45:52 +00:00
Martin Kiewitz
935ded3615 SCI: force palette merging for kq6 hires portraits (cause its needed on those)
svn-id: r47577
2010-01-26 22:34:17 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Martin Kiewitz
6a5dbf6db7 SCI: continue when kPortrait is called with no sync resource existant for mouth movement, prints warning() instead
svn-id: r47263
2010-01-12 12:00:00 +00:00
Filippos Karapetis
6d53dfe917 Some portrait-related changes, to be used when portrait loading/unloading is done. Also, added a comment on where the class is used
svn-id: r47251
2010-01-11 14:12:52 +00:00
Filippos Karapetis
51afa7b0b6 - Set the palette inside doit() again
- Removed a now obsolete TODO
- Portrait animations are now stopped when the Esc key is pressed, or when the engine should quit

svn-id: r47247
2010-01-11 10:59:52 +00:00
Filippos Karapetis
fc8fc3a664 The portrait file data is now freed after the portrait animation is done
svn-id: r47246
2010-01-11 10:37:32 +00:00
Filippos Karapetis
4996b7a7d4 Cleanup, fixed a memory leak
svn-id: r47245
2010-01-11 10:31:40 +00:00
Filippos Karapetis
009b86e8cb - Don't set the palette per portrait frame - setting the whole screen palette is a very expensive operation, and shouldn't be done on each frame, especially when all of the frames use the same palette
- Cleanup

svn-id: r47241
2010-01-11 09:30:41 +00:00
Martin Kiewitz
bda3fc940c SCI: kPortrait - abort on mouse presses only
svn-id: r47225
2010-01-10 13:22:45 +00:00
Martin Kiewitz
4122e411d0 SCI: kPortrait - mouse click now aborts portrait
svn-id: r47224
2010-01-10 13:11:53 +00:00
Martin Kiewitz
156e341e9b SCI: kPortrait - error() out when resource could not be found
svn-id: r47222
2010-01-10 11:29:58 +00:00
Martin Kiewitz
2c1ef90b87 SCI: kPortrait - now drawing after wait, also using gui wait so mouse cursor still works during execution, makes lip sync perfect (thx to the other fix by fingolfin)
svn-id: r47214
2010-01-09 23:01:38 +00:00
Martin Kiewitz
8fdf6a8095 SCI: kPortrait - drawing base bitmap before drawing animation bitmap
svn-id: r47211
2010-01-09 21:20:39 +00:00
Martin Kiewitz
6619d95f48 kPortrait: found the coordinate offsets, corrected actual bitmap size (sometimes extra bytes are appended per line) animation bitmaps now valid
svn-id: r47210
2010-01-09 21:12:08 +00:00
Martin Kiewitz
c73927ee4c SCI: deleting _bitmaps and unlocking sync resource in kPortrait
svn-id: r47208
2010-01-09 20:43:24 +00:00
Martin Kiewitz
273da184ee SCI: kPortrait - animation included, doesnt seem right currently coordinate offset is missing (cause i cant find it) and mouth movement doesnt seem right...at least the basics work and graphic data is fine
svn-id: r47206
2010-01-09 20:38:22 +00:00
Martin Kiewitz
7f78815e0e SCI: kPortrait almost fully implemented (animation bitmaps still missing)
svn-id: r47204
2010-01-09 19:12:53 +00:00
Martin Kiewitz
30d787a829 SCI: adding audio support to kPortrait, audio is now playing when portraits are shown
svn-id: r47202
2010-01-09 18:18:52 +00:00
Martin Kiewitz
58aab46f06 SCI: some portrait work (kq6 now shows the main bitmap as portrait, coordinates still messed up)
svn-id: r47105
2010-01-07 10:31:29 +00:00