From 7f86d151930298e5c2866d47f4f5c41ceb1f1f08 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Tue, 29 Oct 2013 23:09:42 +0100 Subject: TSAGE: FIX CID 1003725, 1003726, 1002380, 1002379 --- engines/tsage/ringworld2/ringworld2_scenes0.cpp | 10 ++++++++++ engines/tsage/ringworld2/ringworld2_scenes0.h | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index d1d4fabb01..7fc0af061b 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -2352,6 +2352,14 @@ Scene205::Scene205(): SceneExt() { GfxFont font; font.setFontNumber(4); _fontHeight = font.getHeight(); + + for (int i = 0; i < 3; i++) { + _objList1[i] = nullptr; + _objList2[i] = nullptr; + } + + for (int i = 0; i < 4; i++) + _objList3[i] = nullptr; } void Scene205::postInit(SceneObjectList *OwnerList) { @@ -4253,6 +4261,7 @@ void Scene325::consoleAction(int id) { _icon2.setIcon(24); _icon3.setIcon(25); _icon4.setIcon(26); + break; case 2: case 16: case 17: @@ -4363,6 +4372,7 @@ void Scene325::consoleAction(int id) { break; case 8: R2_GLOBALS._sceneManager.changeScene(300); + break; case 9: case 10: _iconFontNumber = (id - 1) == 9 ? 50 : 52; diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.h b/engines/tsage/ringworld2/ringworld2_scenes0.h index fe42f1e33e..3662a20c35 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.h +++ b/engines/tsage/ringworld2/ringworld2_scenes0.h @@ -213,7 +213,6 @@ public: int _field412, _field480; int _field482, _frameInc; int _fontNumber, _fontHeight; - int _scene180Mode; public: Scene180(); -- cgit v1.2.3