3236 Commits

Author SHA1 Message Date
Adrian Frühwirth
00e59a3122 ALL: Load savegame thumbnail only when necessary
This commit introduces the following changes:

1. Graphics::loadThumbnail()

   Now returns a boolean and takes a new argument skipThumbnail which
   defaults to false. In case of true, loadThumbnail() reads past the
   thumbnail data in the input stream instead of actually loading the
   thumbnail. This simplifies savegame handling where, up until now,
   many engines always read the whole savegame metadata (including
   the thumbnail) and then threw away the thumbnail when not needed
   (which is in almost all cases, the most common exception being
   MetaEngine::querySaveMetaInfos() which is responsible for loading
   savegame metadata for displaying it in the GUI launcher.

2. readSavegameHeader()

   Engines which already implement such a method (name varies) now take
   a new argument skipThumbnail (default: true) which is passed
   through to loadThumbnail(). This means that the default case for
   readSavegameHeader() is now _not_ loading the thumbnail from a
   savegame and just reading past it. In those cases, e.g.
   querySaveMetaInfos(), where we actually are interested in loading
   the thumbnail readSavegameHeader() needs to explicitely be called
   with skipThumbnail == false.

   Engines whose readSavegameHeader() (name varies) already takes an
   argument loadThumbnail have been adapted to have a similar
   prototype and semantics.
   I.e. readSaveHeader(in, loadThumbnail, header) now is
   readSaveHeader(in, header, skipThumbnail).

3. Error handling

   Engines which previously did not check the return value of
   readSavegameHeader() (name varies) now do so ensuring that possibly
   broken savegames (be it a broken thumbnail or something else) don't
   make it into the GUI launcher list in the first place.
2018-04-07 09:26:20 +02:00
Eugene Sandulenko
511457818d SCUMM: Mark methods as override 2018-03-28 12:01:38 +02:00
Thierry Crozat
7cbf5a9289 SCUMM: Fix interrupting speech not working with AZERTY keyboard
On my AZERTY keyboard the period is obtained using SHIFT + ; and
the code checking the PERIOD keycode and no modifier was failing
on both account. The manual for my French DOTT mentions the period
key, but I have not actually checked how it worked with the original
executable and if using the semicolon key without shift or using the
colon key (which would be the period key on a English-US layout)
works.
2018-03-24 18:17:24 +00:00
Bastien Bouclet
4d0bb753e4 GUI: Remove the ThemeItem draw queues
Drawing nows happens directly when the Dialog or Widget draw methods are
called. This makes it easy to debug why a particular low level draw
method was called, by inspecting the call stack.

This replaces the notion of "buffering" by two independant ways to
control what is drawn and where:
- The active layer is used to select whether the foreground or
  background part of the dialogs are rendered by the draw calls.
- The active surface is used to select if the draw calls affect the back
  buffer or the screen.

The foreground layer of the active dialog is drawn directly to the
screen. Its background layer is drawn to the back buffer. This way
widgets can restore the back buffer in order to update without having to
redraw the dialog's background.

Dialogs lower in the dialog stack are drawn entirely to the back buffer.
2018-03-12 11:46:04 +01:00
Robert Crossfield
b1bce3ec37 SCUMM: MM V0: Fix regression from 038b3b178939f1bcc6714eda1b88c3e80e787c02 and comment/cleanup 2018-03-12 11:36:04 +01:00
Eugene Sandulenko
e7eaff13bf JANITORIAL: Fix code formatting 2018-02-04 12:59:57 +01:00
nukeykt
e5bfead345 SCUMM HE: Use Miles AdLib driver 2018-02-04 12:56:06 +01:00
Eugene Sandulenko
c8975f9ba7 Revert "SCUMM: Check for and flag demos correctly"
There are too many regressions.
2018-02-01 08:03:39 +01:00
Colin Snover
ffdb5a8ebc SCUMM: Fix compilation failure when DISABLE_TOWNS_DUAL_LAYER_MODE is defined 2018-01-31 21:24:09 -06:00
Colin Snover
08186aeec6 SCUMM: Rename iMUSE save/load function to avoid confusing function hiding 2018-01-31 21:24:09 -06:00
Henrik "Henke37" Andersson
f71dc0d8ab SCUMM: Check for and flag demos correctly
Rewrote the detection matching to use the extra field like the other
two.

This requires extensive testing due to touching code shared for a lot of
games and being sensitive to individual versions of games.
2018-01-31 21:01:28 +01:00
Colin Snover
4e6b60948d SCUMM: Remove variable shadowing 2018-01-31 12:24:32 -06:00
Colin Snover
979ae76ec1 SCUMM: Fix compilation failure 2018-01-31 12:08:17 -06:00
Eugene Sandulenko
52ecf7f5b2 SCUMM: Fix warning (it generates another one in common/ though) 2018-01-31 18:02:04 +01:00
Colin Snover
2e061d95c5 COMMON: Move VER macro for serializer into common code 2018-01-31 17:58:01 +01:00
Colin Snover
9916b26383 SCUMM: Replace UB-triggering serialization code with Common::Serializer
Fixes Trac#10342.
2018-01-31 17:58:01 +01:00
Colin Snover
9d10a998ae SCUMM: Fix stack overflow initializing locals
This happens when clicking on the triangular button in room 27 in
The Dig.

There are probably several other places where this overflow
happens, since there are several different `int args[16]` in
the code (and many more `int args[` of various sizes, not all of
which are at least NUM_SCRIPT_LOCAL).
2018-01-31 17:56:33 +01:00
Colin Snover
b166746b9c SCUMM: Fix stack overflow initializing locals
This happens at least when trying to right click on the motorcycle
at the start of Full Throttle.
2018-01-31 17:56:33 +01:00
Adrian Frühwirth
16eac57834 SCUMM: implement lipsync for v7 games 2018-01-31 16:38:07 +01:00
Giovanni Bajo
3a60637d77 SCUMM: really implement lipsync
It looks like the code was there, but it was never fully implemented
because _curSoundPos was never being incremented. Experimentally,
it looks like it works if it is a 60FPS counter.
2018-01-31 16:36:24 +01:00
Bastien Bouclet
5878c618c9 GUI: Remove Dialog::markAsDirty to expose full GUI redraws 2018-01-27 18:12:34 +01:00
Kirben
f383f00274 SCUMM HE: Add early version of Let's Explore the Farm with Buzzy. 2017-12-22 15:46:22 +11:00
Colin Snover
4d3f05ae79 SCUMM: Fix array overflow writing var when no current script is set
This situation is triggered normally when _currentScript is 0xFF,
but it could potentially also happen if _currentScript is some
other number >= NUM_SCRIPT_SLOT, so the check is a bit more
conservative than it might appear to need to be.
2017-12-01 19:39:30 -06:00
Colin Snover
2b5605362a SCUMM: Fix signed integer overflow reading default v70HE cursor 2017-12-01 19:23:00 -06:00
Colin Snover
c7989bb333 SCUMM: Fix buffer overflow reading default v70HE cursor 2017-12-01 19:22:56 -06:00
Colin Snover
5cd2c9a387 SCUMM: Fix possible return of garbage values 2017-12-01 19:22:52 -06:00
Colin Snover
57084b4a1b SCUMM: Fix UB shifting negative integers in Actor 2017-12-01 19:22:35 -06:00
Colin Snover
9a36870e78 SCUMM HE: Fix UB shifting negative integers 2017-12-01 19:22:19 -06:00
Eugene Sandulenko
89a782466a SCUMM: Revert skipping of MM C64 demo original save screen display attempt
As per discussion in bug #10116.
2017-11-27 20:50:28 +01:00
Eugene Sandulenko
5183b2024c SCUMM: Do not do anything for real with original save screen in MM C64 demo 2017-11-26 05:15:42 +01:00
Eugene Sandulenko
a7182e2a6a SCUMM: Do not try to show original save/load screen in C64 demo
Fixes bug #10116
2017-11-25 23:35:28 +01:00
Colin Snover
0eda63bed1 SCUMM: Fix race condition in MOD player
Fixes Trac#6272.
2017-11-12 23:15:05 -06:00
Colin Snover
51329c0dc6 ALL: Fix misuse of comma operator 2017-11-10 09:57:03 -06:00
Ben Castricum
a8faf239a1 SCUMM: Prevent false detection of Steam games 2017-10-31 11:03:53 +01:00
Colin Snover
64191781b5 SCUMM: Fix compilation on systems without USE_RGB_COLOR 2017-10-07 13:09:07 -05:00
Colin Snover
432fd522d2 ENGINES: Remove default1x scaler flag
This flag is removed for a few reasons:

* Engines universally set this flag to true for widths > 320,
  which made it redundant everywhere;
* This flag functioned primarily as a "force 1x scaler" flag,
  since its behaviour was almost completely undocumented and users
  would need to figure out that they'd need an explicit non-default
  scaler set to get a scaler to operate at widths > 320;
* (Most importantly) engines should not be in the business of
  deciding how the backend may choose to render its virtual screen.
  The choice of rendering behaviour belongs to the user, and the
  backend, in that order.

A nearby future commit restores the default1x scaler behaviour in
the SDL backend code for the moment, but in the future it is my
hope that there will be a better configuration UI to allow users
to specify how they want scaling to work for high resolutions.
2017-10-07 12:30:29 -05:00
Bastien Bouclet
3eb82462e7 ALL: Specify the DisposeAfterUse constructor argument for dynamic memory write streams 2017-09-22 07:06:21 +02:00
Ben Castricum
203b5138fa SCUMM: Update MD5 include file 2017-08-21 16:04:31 +02:00
Ben Castricum
f26e36c2e4 SCUMM: Add detection for German version of Spy Fox 1, fixes bug #9732 2017-08-21 16:04:31 +02:00
Ben Castricum
ae8f6397eb SCUMM: Prevent darkenPallete() in Room 0 in FT, fixes bug #9871 2017-08-17 09:47:03 +01:00
Eugene Sandulenko
b840320c5b SCUMM: Moonbase: Mark original bug as fall through to silence GCC 7 warning 2017-08-11 20:53:21 +02:00
Eugene Sandulenko
e0b3001218 SCUMM: Add missing return statement 2017-08-11 20:20:25 +02:00
Eugene Sandulenko
41d8441ea8 SCUMM: Add missing break to INSANE code. Thanks to eriktorbjorn and GCC7 2017-08-11 20:13:24 +02:00
Kirben
2fe8931907 SCUMM: Don't list Amiga version of The Secret of Monkey Island as VGA, as it leads to confusion. 2017-08-10 09:35:33 +10:00
Torbjörn Andersson
0bde79b2b8 JANITORIAL: Silence some more GCC 7 fall through warnings 2017-08-06 16:35:25 +02:00
Torbjörn Andersson
4fb0d1e56f JANITORIAL: Increase buffer size to fix potential overflow
Caught by GCC 7 (though the warning seemed misleading to me). Since
SoundDesc->name can potentially be 14 characters "%s_reg%03d.fla"
can be 25 characters, plus the terminating \0.
2017-08-06 12:00:32 +02:00
Torbjörn Andersson
b4c1e86d9f JANITORIAL: Silence GCC warning
Since case 64 was added for "MM C64 Costume Animation", and
considering the way it's written to only affect game version 0,
it is clearly an intentional fall through.
2017-08-06 11:51:57 +02:00
D G Turner
5c85230443 SCUMM: Fix Typo in Detection Table Comment.
No functional change.
2017-08-04 04:27:09 +01:00
Ben Castricum
d58f594755 SCUMM: MI2 kill tune 113 on start of next, Fixes bug #1410 / Booty Island
Fix the "MI2: Two soundtracks playing at once" bug from the bug tracker.
It's triggered when the player enters the kiosk for the second time and
leaves before tune 113 is started.
2017-07-30 22:10:54 +02:00
Ben Castricum
392d8b44ff SCUMM: MI2 kill tune 107 on start of next, Fixes bug #1410 / Scabb Island
Fix the "MI2: Two soundtracks playing at once" bug from the forum.  It's
triggered when the player is moving faster then the scripts expect causing
the "stop tune 117" command be executed before the start of the tune.
Effectily creating a hanging tune 107.
This patch kills the tune when this sitation is detected.
2017-07-30 22:10:54 +02:00