diff options
author | Strangerke | 2013-08-28 00:04:47 +0200 |
---|---|---|
committer | Strangerke | 2013-08-28 00:06:07 +0200 |
commit | 269ec30699beee4913893750372de7c5777b3b5d (patch) | |
tree | 08b874cbe65d3157af912b25c254ef6790f9d82a /engines | |
parent | e432d0a83fb68c175ed7aaffe673bdf7ac4b762c (diff) | |
download | scummvm-rg350-269ec30699beee4913893750372de7c5777b3b5d.tar.gz scummvm-rg350-269ec30699beee4913893750372de7c5777b3b5d.tar.bz2 scummvm-rg350-269ec30699beee4913893750372de7c5777b3b5d.zip |
TSAGE: Remove SceneExt::loadScene() as the code is duplicate from Scene::loadScene()
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_logic.cpp | 21 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_logic.h | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp index 174399f099..a50dccda03 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.cpp +++ b/engines/tsage/ringworld2/ringworld2_logic.cpp @@ -384,27 +384,6 @@ void SceneExt::dispatch() { Scene::dispatch(); } -void SceneExt::loadScene(int sceneNum) { - Scene::loadScene(sceneNum); - - _v51C34.top = 0; - _v51C34.bottom = 300; - - int prevScene = R2_GLOBALS._sceneManager._previousScene; - int sceneNumber = R2_GLOBALS._sceneManager._sceneNumber; - - if (((prevScene == -1) && (sceneNumber != 180) && (sceneNumber != 205) && (sceneNumber != 50)) || - (sceneNumber == 50) || ((prevScene == 205) && (sceneNumber == 100)) || - ((prevScene == 180) && (sceneNumber == 100))) { - // TODO: sub_17875 - R2_GLOBALS._uiElements._active = true; - R2_GLOBALS._uiElements.show(); - } else { - // Update the user interface - R2_GLOBALS._uiElements.updateInventory(); - } -} - bool SceneExt::display(CursorType action, Event &event) { switch (action) { case CURSOR_CROSSHAIRS: diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h index 62a596146b..2b2a28aff8 100644 --- a/engines/tsage/ringworld2/ringworld2_logic.h +++ b/engines/tsage/ringworld2/ringworld2_logic.h @@ -101,7 +101,6 @@ public: virtual void remove(); virtual void process(Event &event); virtual void dispatch(); - virtual void loadScene(int sceneNum); virtual void refreshBackground(int xAmount, int yAmount); virtual void saveCharacter(int characterIndex); virtual void restore() {} |