Commit Graph
305 Commits
Author SHA1 Message Date
AndywinXp 2194bcab96 SCUMM: MACGUI: Fix cursor handling when saving/loading 2024-10-28 08:24:59 +01:00
AndywinXp 2d12a2f5bd SCUMM: Add post-load fix comments 2024-10-28 08:24:59 +01:00
AndywinXp 9f319cdd86 SCUMM: Add Mac screen implementation for remaining LEC games
This adds optional EPX scaling and 640x480 resolution for
LucasArts Macintosh games other than Indy3 and Loom.

This includes:
* Monkey Island 1
* Monkey Island 2
* Indy4
* Day of the Tentacle
* Sam&Max
* Full Throttle
* The Dig

In doing this, I reverted the ugly code which previously offset
the game screen 20 pixels below (to create an internal 320x240
buffer, instead of 320x200). Instead of just offsetting mouse
coordinates and the final screen texture, I used to offset the
in-engine graphics elements. Ew.

This ensures flawless savegame compatibility between old and
new, without touching anything.
2024-10-28 08:24:59 +01:00
AndywinXp 31cd07e6ce SCUMM: Revert silently denying autosaving with original GUI 2024-09-19 08:09:25 +03:00
AndywinXp 0b7129347a SCUMM: Revert "Explicitly disable autosaving when original GUI is active"
This reinstates autosaving when original GUI is active,
now that it won't collide with saves made from the original menu.
2024-09-19 08:09:25 +03:00
AndywinXp 8b5ad52d88 SCUMM: HE: Add u32 code for Backyard Basketball 2024-09-16 13:01:49 +03:00
Hubert Maier 370064f93f JANITORIAL: SCUMM: Fix typos 2024-09-16 01:55:26 +03:00
AndywinXp 7520fed5ab SCUMM: MAC: Improve inconsistent sound card state detection 2024-09-02 23:10:47 +02:00
AndywinXp fd5e608612 SCUMM: MONKEY1 (Macintosh): Fix crash when loading 2.8.0 saves
This fixes #15353:
"SCUMM: MONKEY1 (Macintosh) Crash in saveLoadWithSerializer loading 2.8.0 saves on 2.9.0git"

I didn't take into account the fact that this version had 0xFFFF as VAR_SOUNDCARD,
at startup. I'm not disabling this soundcard detection thingy for the Mac versions for now,
because I'm not sure how different sound quality settings behave during saving/loading.
2024-09-02 22:57:56 +02:00
AndywinXp 51b34c33e4 SCUMM: Explicitly disable autosaving when original GUI is active
This addresses #15063:
"SCUMM: Autosave warnings still pop up when classic menus are used"

The implemented solution was proposed by antoniou79.
2024-08-11 20:04:59 +02:00
AndywinXp 4ca24fd8ce SCUMM: Fix illegal variable access 2024-08-11 18:59:37 +02:00
AndywinXp 7fa4d3daa7 SCUMM: Add warning msg for sound config mismatches on savegame loading 2024-08-11 18:26:12 +02:00
athrxx 158614fce6 SCUMM: some Coverity fixes 2024-05-07 19:26:06 +02:00
athrxx 55f1bbd47d SCUMM: (FM-Towns) - add menu option to force 640 x 480 mode
English versions usually run in a 320 x 240 resolution in ScummVM.
The original interpreter uses 640 x 480. It has a unique pause/restart
banner that we cannot display in 320 x 240. So that is really the only
reason for adding this option.
2024-05-01 16:06:11 +02:00
AndywinXp 4bcfff35bd SCUMM: HE: Bump save version 2024-04-26 23:21:29 +02:00
AndywinXp b19c4b772d SCUMM: HE: Overhaul more of the GFX system
* Overhaul sprites system
* Fix compression routines for 8-bit graphics
* More fixes and clean-up
2024-04-26 23:21:29 +02:00
AndywinXp d64a379d21 SCUMM: HE: Begin porting Wiz and other graphics code 2024-04-26 23:21:29 +02:00
AndywinXp 0a3b6c49b2 SCUMM: HE: Implement FloodFill operation 2024-04-26 23:21:29 +02:00
athrxx aedb74be6e SCUMM: (MI1/Amiga) - implement music restart after load 2024-04-14 23:21:47 +02:00
AndywinXp 1510131328 SCUMM: HE: Fix sounds not being stopped on saving 2024-04-06 12:22:44 +02:00
athrxx fd0a98a2d3 SCUMM: (IMS) - fix speed parameter for new system
For the newer system, the value is interpreted as having
a range from 0 - 127, with 64 the default. Can be tested in
Samnmax in the Tunnel of Love, after stuffing Max into
the fuse box. Now it is like DOSBox, before it was way too slow.
2024-03-16 23:49:14 +01:00
athrxx c5ab90d6e7 SCUMM: (IMS) - improve parameter faders
The volume and pitch faders should be fine, now.
I haven't fixed the speed fader, since the whole
handling of the speed setting would need to get
examined a bit closer. I think we're doing it wrong
(but maybe correctly for MI2/INDY4/DOTT?), but
this can be fixed separately...
2024-03-15 21:19:01 +01:00
athrxx 78433d5085 SCUMM: (MI1/Mac) - extend new sound player to support MI1 2024-03-07 22:30:18 +01:00
athrxx c5ef168572 SCUMM: (LOOM) - extend cursor postload fix to all versions
I have encountered the bug with the 0 width/height
cursor in the FM-Towns version, too.
2024-03-03 15:01:31 +01:00
athrxx aee2bf53bb SCUMM: (Loom/Mac) - add new sound player
This  should provide more accurate and feature complete
sound than the existing player (which is still there, just
disabled). I haven't implemented a proper quality selection
method yet.
2024-02-28 21:01:41 +01:00
athrxx 439b8dcbd2 SCUMM: (INDY3/MAC): save/load sound state 2024-01-31 19:34:43 +01:00
athrxx 938b703ba5 SCUMM: move VAR_SOUNDCARD reset to extra function
(also update it after loading a savegame)
2024-01-28 16:57:59 +01:00
Torbjörn Andersson fb2bd1166d SCUMM: Split up gfx_mac.cpp into new macgui directory
The Mac GUI code is getting unwieldy, and this is an attempt at breaking
it up into more manageable chunks.
2023-12-22 15:09:06 +01:00
Eugene Sandulenko 3d90caa894 SCUMM: Explain to HE games players that the save/loading is not supported from GMM 2023-12-08 12:21:16 +01:00
Eugene Sandulenko ec2dd2726b ENGINES: Added optional parameter to canSave/LoadGameStateCurrently() for indicating the reason 2023-12-08 12:21:16 +01:00
AndywinXp bd22763cdc SCUMM: MACGUI: Implement correct video size for Mac v3 games
This commit brings games to 640x480 (from 640x400).
All old savegames are compatible and are brought up to date in
real time.
2023-12-03 21:03:59 +01:00
AndywinXp d9d4c278e1 SCUMM: Attempt at fixing blocker #14614
We limit this piece of code to the one and only game having a
PC Engine port, which is Loom.
2023-11-30 23:09:35 +01:00
athrxx 165c8d14f2 SCUMM: add newly introduced var to saving/loading
(also do some minor cleanup to that new code)
2023-11-21 22:50:02 +01:00
Torbjörn Andersson ec1ab82283 SCUMM: Initial work on a common MacGui class that handles Mac menus etc.
This will be used for Last Crusade and Loom. Loom is currently the more
broken of the two, though.
2023-11-18 18:47:39 +01:00
Eugene Sandulenko 319dcd9a89 SCUMM: Fix crash on engine startup
If we show the "Audio files compressed with ScummVM Tools were detected"
message, we are in the middle of initialization. If a user tries to
launch the GMM while the message is still on, it will lead to a crash.
2023-11-12 01:33:39 +01:00
sluicebox c319791519 SCUMM: Fix memory leak in changeSavegameName. PVS-Studio V773 2023-10-30 13:11:17 -07:00
Torbjörn Andersson 175d53905c SCUMM: Increased savegame version
The new Mac GUI doesn't change the savegame format, but it removes a
couple of verbs. It can read old savegames just fine, but new ones will
not be usable by older versions.
2023-10-16 17:40:29 +02:00
Torbjörn Andersson 44b7558756 SCUMM: Remove Indy 3 Mac hacks that are no longer needed 2023-10-16 17:40:29 +02:00
Torbjörn Andersson ead11c29e7 SCUMM: Try to fix Indy 3 Mac GUI after loading 2023-10-16 17:40:29 +02:00
Torbjörn Andersson 716cd6e0e5 SCUMM: Remove Indy 3 Mac GUI mock-up. Begin work on proper GUI.
The goal is to make the interface as simple as possible, and to put as
much of the knowledge of what's going on into MacIndy3Gui itself.
2023-10-16 17:40:29 +02:00
Torbjörn Andersson c6d1a256ef SCUMM: Moved Mac Indy 3 GUI into its own class
This is still just a mock-up, and a bad one at that. It will all be for
nought unless I can figure out how to wire up these buttons to the SCUMM
verbs.
2023-10-16 17:40:29 +02:00
AndywinXp 06052c78ea SCUMM: Use "compat" param when checking for heap saves in loadState()
Unfortunately _saveTemporaryState really is unrealiable.
2023-09-15 10:48:18 +02:00
AndywinXp eb44252d88 SCUMM: IMUSE: Fix quiet sound beginning after loading a heap save
E.g. when exiting the lost dialogue of Plato screen in INDY4,
sound would dip down for a fraction of second. This is a result
of a workaround of our own, which should be disabled during
heap/temporary saves handling.
2023-09-14 21:45:56 +02:00
AndywinXp 9c724a203c SCUMM: HE (Sound): Do not stop sounds for heap saves under version 80
This is explicitly what HE72 and below asks; it is implied that
whatever sound will be running at that point will be handled
via the scripts.
2023-09-14 21:43:24 +02:00
AndywinXp 44fc2ae2ee SCUMM: HE: Fix #14621
The issue, although minor, was there because of a workaround
which is incompatible with what the original HE code is trying to
do at that point; removing that workaround for HE games fixes it.
2023-09-14 21:41:40 +02:00
AndywinXp 127062cdbf SCUMM: IMUSE: Stop speech when loading temporary save state
This fixes an inaccuracy in situations where a talkie
continues after exiting from a temporary save state,
e.g. looking at the National Archeology journal in Indy4
and exiting the screen before speech is over.
2023-09-14 20:11:47 +02:00
AndywinXp da8be8c0db SCUMM: Don't pause sound engine for temporary saves
This get rids of a whole class of sound glitches across the
engine, where temporary saves paused sound for a fraction
of second, resulting in a hiccup.

Examples: reading the dialogue of Plato in INDY4, looking
at the recipe book in COMI.

Concept suggested by eriktorbjorn, and proved by the fact
that disasms do not pause audio at when saving.
2023-09-14 15:12:11 +02:00
Torbjörn Andersson c4b4dcf6c4 SCUMM: Fix crash when loading Mac Loom savegames
This is the same problem that has affected version 6 games and Mac Indy
3, so hopefully this fix is enough. I changed the _macScreen check to
check for platform, since that seemed more sensible to me. Some day, we
should probably get rid of the ability to play the Mac versions in low
resolution anyway.
2023-09-05 20:35:00 +02:00
Le Philousophe 5bdd9e6f50 ALL: Unify zlib and gzio API
zlib is used when available and falls back on gzio.
This allows performance improvements as our CRC32 and gzio
implementations are slower than base zlib.
As zlib is available when libpng is present, this is sensible to
benefit from it.
2023-08-28 21:49:03 +02:00
AndywinXp 438bdce454 SCUMM: Implement proper v4 palette cycling code
This commit properly takes care of #10854 and #1016;
the previous code was retrofitted from v5 and thus potentially
presented inaccuracies (e.g. room 1 in LOOM CD shouldn't
cycle colors).

A post-load fix was also necessary for older savegames,
otherwise color cycling would not occur at all until the room
was exited and then re-entered. Being that the cycling data
was being mangled by the previous implementation, there was
no choice but to introduce a new save version to detect this.
2023-06-12 00:26:02 +02:00