diff options
| author | Jaromir Wysoglad | 2019-07-11 12:52:41 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2019-07-28 15:09:14 +0100 |
| commit | e734872fc84c2406c783cb291fb4ccf05acc8613 (patch) | |
| tree | c7f910991ca277bb9b246b77c1cd4c167e64fb0e /engines/supernova | |
| parent | e5a5aed28c804dea8e1afd8bb4136c0d9bb4e735 (diff) | |
| download | scummvm-rg350-e734872fc84c2406c783cb291fb4ccf05acc8613.tar.gz scummvm-rg350-e734872fc84c2406c783cb291fb4ccf05acc8613.tar.bz2 scummvm-rg350-e734872fc84c2406c783cb291fb4ccf05acc8613.zip | |
SUPERNOVA: Fix some code issues pointed by Criezy
Remove 2 unused variables and a function call with wrong datatype
Diffstat (limited to 'engines/supernova')
| -rw-r--r-- | engines/supernova/game-manager.cpp | 1 | ||||
| -rw-r--r-- | engines/supernova/game-manager.h | 3 | ||||
| -rw-r--r-- | engines/supernova/supernova.cpp | 2 | ||||
| -rw-r--r-- | engines/supernova/supernova2/rooms.h | 3 | ||||
| -rw-r--r-- | engines/supernova/supernova2/state.h | 3 |
5 files changed, 1 insertions, 11 deletions
diff --git a/engines/supernova/game-manager.cpp b/engines/supernova/game-manager.cpp index e98218d02b..2672a6fbca 100644 --- a/engines/supernova/game-manager.cpp +++ b/engines/supernova/game-manager.cpp @@ -192,7 +192,6 @@ void GameManager::initState() { _rowsStart[i] = 0; } - _prevImgId = 0; _dead = false; } diff --git a/engines/supernova/game-manager.h b/engines/supernova/game-manager.h index 1700ab84d0..07c1576f39 100644 --- a/engines/supernova/game-manager.h +++ b/engines/supernova/game-manager.h @@ -199,9 +199,6 @@ public: void reply(const char *text, int aus1, int aus2); void mousePosDialog(int x, int y); virtual void takeMoney(int amount); - -private: - int _prevImgId; }; } diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp index 10a460a7e7..8ab38e41c6 100644 --- a/engines/supernova/supernova.cpp +++ b/engines/supernova/supernova.cpp @@ -528,7 +528,7 @@ Common::Error SupernovaEngine::showTextReader(const char *extension) { filename = Common::String::format("ms2.%s", extension); if (!file.open(filename)) { - GUIErrorMessageFormat(_("Unable to find '%s' in game folder or the engine data file."), filename); + GUIErrorMessageFormat(_("Unable to find '%s' in game folder or the engine data file."), filename.c_str()); return Common::kReadingFailed; } stream = file.readStream(file.size()); diff --git a/engines/supernova/supernova2/rooms.h b/engines/supernova/supernova2/rooms.h index 6d43b4cf1c..2520db8807 100644 --- a/engines/supernova/supernova2/rooms.h +++ b/engines/supernova/supernova2/rooms.h @@ -107,9 +107,6 @@ public: virtual void onEntrance(); virtual void animation(); virtual bool interact(Action verb, Object &obj1, Object &obj2); - -private: - bool _paid; }; class Kiosk : public Room2 { diff --git a/engines/supernova/supernova2/state.h b/engines/supernova/supernova2/state.h index 64d070dcf7..4d98673dfd 100644 --- a/engines/supernova/supernova2/state.h +++ b/engines/supernova/supernova2/state.h @@ -128,9 +128,6 @@ public: void securityEntrance(); void pressureAlarmCount(); void pressureAlarmEntrance(); - -private: - int _prevImgId; }; } |