Age | Commit message (Collapse) | Author |
|
|
|
|
|
The error was:
no viable conversion from 'std::__1::nullptr_t' to 'const Common::String'
|
|
|
|
|
|
|
|
This is based on guesswork, particularly with regards to the volume.
It sounds pretty close to a YouTube video I saw of the original game,
and at least it's not unpleasantly loud.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This is similar to IS_SERRATED_SCALPEL and IS_ROSE_TATTOO, and makes
the code a bit easier to read
|
|
|
|
The paper boy in the intro sounds correct now
|
|
if no directory was given, load sounds from room sounds directory
|
|
|
|
|
|
|
|
This allows the intro to run a tiny bit further, before crashing.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
engines/sherlock/decompress.cpp
engines/sherlock/objects.cpp
engines/sherlock/objects.h
engines/sherlock/scene.cpp
engines/sherlock/scene.h
engines/sherlock/sound.cpp
|
|
|