Age | Commit message (Collapse) | Author |
|
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
|
|
|
|
|
|
|
|
|
|
To make it easier to use the "dumpfile" command. There is little-
to-no sanity checking in this one...
|
|
|
|
|
|
This adds support for Rose Tattoo and 3DO version of Serrated
Scalpel.
|
|
|
|
|
|
|
|
|
|
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...
|
|
|
|
|
|
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
|
|
|
|
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.
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
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
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
This actually fixes a bug when the lady storms out of
Rumsey's Haberdashery.. if she leaves too quickly, Watson's
farewell dialog is still active, and stops a needed flag being set
|
|
|
|
This fixes '*Solve' appearing as an option in the right click
menu for the Foolscap before you pick it up
|
|
|
|
|
|
|
|
|
|
|
|
The changes remove most of the hardcoding that was in place for showing
the conversation movies, and have them triggered like the Rose Tattoo
speech files. It will still need some work to hook it into our new
voice playback, though, so text dialogs are closed at the right time
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
round() is C99; floor() and adding 0.5 to the parameter is sufficient. Probably having detection for floor() and a compatibility definition otherwise would make sense.
|