aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-29 23:31:23 -0400
committerPaul Gilbert2015-05-29 23:31:23 -0400
commit0141dd1af3ac63801d3fcb80d200b8a4719ba55f (patch)
tree25b6555c50bd40225c1b278c3d19c457815002b7
parent08dc811baa587e40af720eeb3e2fe98d4dbd22d7 (diff)
downloadscummvm-rg350-0141dd1af3ac63801d3fcb80d200b8a4719ba55f.tar.gz
scummvm-rg350-0141dd1af3ac63801d3fcb80d200b8a4719ba55f.tar.bz2
scummvm-rg350-0141dd1af3ac63801d3fcb80d200b8a4719ba55f.zip
TSAGE: Showing background of Sherlock Logo scene
-rw-r--r--engines/tsage/core.cpp2
-rw-r--r--engines/tsage/sherlock/sherlock_logo.cpp7
-rw-r--r--engines/tsage/sherlock/sherlock_logo.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 3105a9008e..e8fef014c0 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -1521,7 +1521,7 @@ void ScenePalette::changeBackground(const Rect &bounds, FadeMode fadeMode) {
}
Rect tempRect = bounds;
- if (g_vm->getGameID() != GType_Ringworld)
+ if (g_vm->getGameID() != GType_Ringworld && g_vm->getGameID() != GType_Sherlock1)
tempRect.setHeight(T2_GLOBALS._interfaceY);
g_globals->_screenSurface.copyFrom(g_globals->_sceneManager._scene->_backSurface,
diff --git a/engines/tsage/sherlock/sherlock_logo.cpp b/engines/tsage/sherlock/sherlock_logo.cpp
index 58cefe551b..13594c8de0 100644
--- a/engines/tsage/sherlock/sherlock_logo.cpp
+++ b/engines/tsage/sherlock/sherlock_logo.cpp
@@ -73,6 +73,13 @@ void SherlockSceneHandler::postInit(SceneObjectList *OwnerList) {
/*--------------------------------------------------------------------------*/
+void Object::setVisage(const Common::String &name) {
+ int visageNum = atoi(name.c_str());
+ SceneObject::setVisage(visageNum);
+}
+
+/*--------------------------------------------------------------------------*/
+
void SherlockLogoScene::Action1::signal() {
SherlockLogoScene &scene = *(SherlockLogoScene *)GLOBALS._sceneManager._scene;
diff --git a/engines/tsage/sherlock/sherlock_logo.h b/engines/tsage/sherlock/sherlock_logo.h
index c9fb50e6ef..fcc96386e0 100644
--- a/engines/tsage/sherlock/sherlock_logo.h
+++ b/engines/tsage/sherlock/sherlock_logo.h
@@ -38,7 +38,7 @@ using namespace TsAGE;
class Object : public SceneObject {
public:
- void setVisage(const Common::String &name) {}
+ void setVisage(const Common::String &name);
};
class SherlockLogo: public Game {