Commit Graph
86814 Commits
Author SHA1 Message Date
Sven Hesse 1fa0197229 GOB: Make the currently playing CD track all-uppercase
This is what the original game does too, and the scripts query for
all-uppercase CD track names.

Interestingly, this being wrong has been mostly inconsequential. It
does, however, manifest in one bug in the underwater wreck level of
Gobliins 2. After calling the Moray Eel by lighting the lamp with
Winkle, speaking to said eel has the scripts wait for the currently
playing background track to end before playing the voice lines,
instead of ending the audio track forcefully. The track is only about
a minute long, so it's "only" annoying, not a game-stopper.

The scripts also try to compare the CD track name with some different,
all-uppercase names, so this is possibly relevant in some other places
as well. No such bug report exists at the moment, though.

See also the forum post with the bug report:
http://forums.scummvm.org/viewtopic.php?p=81733#81733

A somewhat related bug report is #2999 "GOB2 : Moray Eel Game Freeze
(Wreck Scene)" (<http://sourceforge.net/p/scummvm/bugs/2999/>). At
that time, the script expression parser still did a stricmp for the
NEQ expression (which is wrong), and that made the bug not trigger.
Commit 5c58b9a3a4, which fixed that
incorrect NEQ behaviour, then made this bug here appear.
2015-09-02 20:38:16 +02:00
Paul Gilbert a23c604232 SHERLOCK: RT: Fix entering search terms in the journal 2015-09-01 19:59:09 -04:00
Paul Gilbert cdf45b264d SHERLOCK: Fix crash when loading games from launcher 2015-08-31 21:13:20 -04:00
Torbjörn Andersson e3be574936 SHERLOCK: Add missing events.getKey() when checking for "pending D keys"
This is consistent with what happens when checking for "pending U
keys", so I think it's correct, but the Scalpel keyboard handling
doesn't work very well at the moment anyway. Probably at least partly
because of the way it mixes char and Common::KeyCode. I haven't
been able to wrap my head around it...
2015-08-31 07:10:49 +02:00
Matthew Hoops c8a7e39e05 AUDIO: Mark the old Codec class as deprecated
Once QuickTime audio edits are rewritten to use PacketizedAudioStream, we can remove this class.
2015-08-30 21:01:43 -04:00
Matthew Hoops 561d1a1d62 VIDEO: Switch to all packetized streams for AVI
ZVision does not currently, but that's OK
2015-08-30 21:01:39 -04:00
Matthew Hoops 72239a25f9 AUDIO: Add a NullAudioStream for streams that are dead-on-arrival 2015-08-30 21:00:54 -04:00
Matthew Hoops 331d8ece21 AUDIO: Add a packetized version of ADPCM streams 2015-08-30 19:53:54 -04:00
Matthew Hoops 3aa9e2c581 AUDIO: Add a packetized version of the PCM stream 2015-08-30 19:53:54 -04:00
Matthew Hoops a64aff0287 AUDIO: Add a class to easily make stateless PacketizedAudioStreams 2015-08-30 19:53:54 -04:00
Matthew Hoops de2f4e6982 VIDEO: Add support for MP3 in AVI 2015-08-30 19:53:53 -04:00
Matthew Hoops ba4469da6a ZVISION: Cleanup the AVI decoder subclass 2015-08-30 19:53:53 -04:00
Matthew Hoops 14e57ca76f VIDEO: Switch MPEG-PS audio code to use the packetized MP3 code 2015-08-30 19:53:53 -04:00
Matthew Hoops 562234b96b AUDIO: Implement a packetized version of MP3 2015-08-30 19:53:53 -04:00
Matthew Hoops ccd8dbf4ba AUDIO: Add an AudioStream subclass for packetized audio 2015-08-30 19:53:53 -04:00
Matthew Hoops 52f67cba39 AUDIO: Split the seeking MP3 class from the base decoding stream 2015-08-30 19:53:53 -04:00
Matthew Hoops 030e4d0608 AUDIO: Make Rewindable- and SeekableAudioStream inherit virtually 2015-08-30 19:53:53 -04:00
Paul Gilbert 2356501d34 Merge branch 'master' into phantom
Conflicts:
	engines/mads/phantom/game_phantom.cpp
	engines/mads/phantom/globals_phantom.h
	engines/mads/phantom/phantom_scenes.h
	engines/mads/phantom/phantom_scenes1.cpp
	engines/mads/phantom/phantom_scenes1.h
	engines/sherlock/events.cpp
	engines/sherlock/inventory.cpp
	engines/sherlock/journal.cpp
	engines/sherlock/map.cpp
	engines/sherlock/map.h
	engines/sherlock/module.mk
	engines/sherlock/music.cpp
	engines/sherlock/music.h
	engines/sherlock/objects.cpp
	engines/sherlock/objects.h
	engines/sherlock/people.cpp
	engines/sherlock/people.h
	engines/sherlock/resources.cpp
	engines/sherlock/resources.h
	engines/sherlock/scalpel/drivers/adlib.cpp
	engines/sherlock/scalpel/drivers/mididriver.h
	engines/sherlock/scalpel/scalpel.cpp
	engines/sherlock/scalpel/scalpel_scene.cpp
	engines/sherlock/scalpel/scalpel_scene.h
	engines/sherlock/scalpel/scalpel_user_interface.cpp
	engines/sherlock/scalpel/scalpel_user_interface.h
	engines/sherlock/scalpel/settings.cpp
	engines/sherlock/scalpel/tsage/logo.cpp
	engines/sherlock/scalpel/tsage/logo.h
	engines/sherlock/scene.cpp
	engines/sherlock/scene.h
	engines/sherlock/screen.cpp
	engines/sherlock/screen.h
	engines/sherlock/sherlock.cpp
	engines/sherlock/sherlock.h
	engines/sherlock/sound.cpp
	engines/sherlock/sound.h
	engines/sherlock/surface.cpp
	engines/sherlock/surface.h
	engines/sherlock/talk.cpp
	engines/sherlock/talk.h
	engines/sherlock/tattoo/tattoo.cpp
	engines/sherlock/tattoo/tattoo.h
	engines/sherlock/tattoo/tattoo_scene.cpp
	engines/sherlock/tattoo/tattoo_scene.h
	engines/sherlock/tattoo/tattoo_user_interface.cpp
	engines/sherlock/tattoo/tattoo_user_interface.h
	engines/sherlock/user_interface.cpp
	engines/sherlock/user_interface.h
2015-08-30 19:36:40 -04:00
Paul Gilbert 62973836e1 SHERLOCK: SS: Make _frameRate unsigned to fix GCC warnings 2015-08-30 12:55:20 -04:00
Paul Gilbert b654369377 SHERLOCK: SS: Fix speed of intro sequence 2015-08-30 12:03:40 -04:00
Paul Gilbert 944cf4c64f SHERLOCK: Syntax fixes 2015-08-30 10:01:25 -04:00
Torbjörn Andersson 3430757bf4 DEBUGGER: Add clarifying comment 2015-08-30 06:49:16 +02:00
Torbjörn Andersson ce2ba7ddc7 SHERLOCK: Add "listfiles" debugger command
To make it easier to use the "dumpfile" command. There is little-
to-no sanity checking in this one...
2015-08-30 06:41:30 +02:00
Paul Gilbert edd95b3eb6 SHERLOCK: RT: Don't check for gameplay keys when entering copy protection 2015-08-29 22:29:43 -04:00
Paul Gilbert 2c28a1e12d SHERLOCK: RT: Fix crash visiting Lawton's house after he's fled 2015-08-29 21:38:08 -04:00
Torbjörn Andersson b11530d87c SHERLOCK: Finish implementation of song / songs debugger commands
This adds support for Rose Tattoo and 3DO version of Serrated
Scalpel.
2015-08-30 00:41:48 +02:00
Paul Gilbert 0fa39d17ca SHERLOCK: RT: Fix resetting cursor after buying coffee from Greengrocer 2015-08-29 16:43:39 -04:00
Paul Gilbert 91c131f8ff SHERLOCK: RT: Reset each person _resetNPCPath when starting a script 2015-08-29 16:14:31 -04:00
Paul Gilbert a6605c3cbb SHERLOCK: RT: Replace constant with it's proper enum value 2015-08-29 16:06:55 -04:00
Torbjörn Andersson 303bbe75d5 SHERLOCK: Fix comment typos 2015-08-29 21:30:55 +02:00
Torbjörn Andersson e734bb5078 SHERLOCK: Rework the "song" debugger command
Instead of taking a room number (which didn't work in Rose Tattoo),
it now takes a song name. To see which songs are available, use the
"songs" command.

Note that this is still only works for Serrated Scalpel, since I
haven't implemented getting a list of available songs for Rose
Tattoo. I need to study the resource manager a bit first...
2015-08-29 18:09:54 +02:00
Torbjörn Andersson 7f4268dc3d DEBUGGER: Add function for printing a StringArray in columns 2015-08-29 18:08:52 +02:00
Paul Gilbert 2ab0b71fd0 SHERLOCK: RT: Fix playing music when displaying the map 2015-08-29 07:41:59 -04:00
Paul Gilbert 42f60565fd SHERLOCK: RT: Add extra delay after showing scene image in the map
The original relied on the delay loading the resources for the scene
to show the image for a few seconds, but since scene loading is so
much faster now, introduce an extra delay to keep it briefly on-screen
2015-08-29 07:38:26 -04:00
Paul Gilbert 92b087d236 SHERLOCK: RT: Fix redundant extra wait after talking to LLoyd Jones 2015-08-29 07:03:20 -04:00
Paul Gilbert fefd46c60c SHERLOCK: RT: Workaround for monkey cap cutscene ending too quickly
Somewhat unusually, the cutscene for the monkey stealing Hodgkins
cap (wilb29a.tlk) is ended immediately after they both run off-screen,
but the characters aren't properly marked as hidden until several
seconds later when another script, 30cuend, is called. If a user
saved the game really quickly before 30cuend is fired, it can leave
the game in an in-consistent state. This commit fixes that by forcing
the WAIT cursor to remain active until 30cuend has executed.
2015-08-28 21:27:17 -04:00
Paul Gilbert c8aa1450a2 SHERLOCK: RT: Enforce wait cursor when pausing without control in scripts 2015-08-28 21:16:41 -04:00
Paul Gilbert 31235218ea SHERLOCK: RT: Reset _npcIndex when loading savegame 2015-08-27 20:34:34 -04:00
Paul Gilbert ca3050c912 SHERLOCK: RT: Fix previous commit, and make talkTo virtual 2015-08-27 08:55:27 -04:00
Paul Gilbert 55f9c364bc SHERLOCK: RT: Fix talkTo filename getting changed mid-script
Calls to cmdPauseWithoutControl can allow a second script to run,
with it's own filename. This shouldn't change the filename for
the outer call to talkTo
2015-08-27 08:28:32 -04:00
Paul Gilbert e96a302b74 SHERLOCK: RT: Fix incorrect Watson movement at Aerodrome scene 2015-08-27 08:18:46 -04:00
Paul Gilbert be4c87a48d SHERLOCK: RT: Workaround for Park Lake bug with Watson's dialogs 2015-08-26 19:40:54 -04:00
Paul Gilbert a563077edb SHERLOCK: Set game speed to match the originals
This applies to make both games match the originals. This is particularly
important for Rose Tattoo, since there are several times Sherlock plays
instruments, and the animations need to sync up with the music
2015-08-25 20:47:18 -04:00
Paul Gilbert 4b8dd6662e SHERLOCK: Fix comment message 2015-08-24 22:13:00 -04:00
Paul Gilbert b4651801dd SHERLOCK: RT: Fix aborting scripts prematurely after pausing
If a script was paused via a call to cmdPauseWithoutControl, and during
this a second script is called and finishes, the first script was
also being terminated prematurely
2015-08-24 19:44:25 -04:00
Paul Gilbert 1c6316a356 SHERLOCK: RT: Fix z-ordering when picking up Hat Pin 2015-08-23 18:41:50 -04:00
Paul Gilbert 902493954e SHERLOCK: RT: Fix Watson going off-screen in Cambridge scene 2015-08-23 18:20:15 -04:00
Paul Gilbert 81ecdf4b51 SHERLOCK: SS: Rename mirror-related methods 2015-08-23 17:00:05 -04:00
Paul Gilbert 70d4f5f84e SHERLOCK: RT: Workaround for incorrect tooltip for man on train ride 2015-08-23 16:05:38 -04:00
Paul Gilbert 6511f2ec2c SHERLOCK: Replace various scene numbers with enum values 2015-08-23 16:01:32 -04:00