aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2019-10-24 07:52:06 +0200
committerEugene Sandulenko2019-11-13 22:07:08 +0100
commit3af6c2132a816ffed57f9cf8f9bfd12f5cf6f872 (patch)
tree2e07a8cd1fe2476599e54c2611f84f589dc43712
parentcb9603b624aeb62ada20bca2b072cfca18d6a5d1 (diff)
downloadscummvm-rg350-3af6c2132a816ffed57f9cf8f9bfd12f5cf6f872.tar.gz
scummvm-rg350-3af6c2132a816ffed57f9cf8f9bfd12f5cf6f872.tar.bz2
scummvm-rg350-3af6c2132a816ffed57f9cf8f9bfd12f5cf6f872.zip
GRIFFON: Remove some unused class members
-rw-r--r--engines/griffon/dialogs.cpp3
-rw-r--r--engines/griffon/engine.cpp3
-rw-r--r--engines/griffon/griffon.h1
-rw-r--r--engines/griffon/sound.cpp3
4 files changed, 0 insertions, 10 deletions
diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp
index 8e2030559f..cefc30b3e8 100644
--- a/engines/griffon/dialogs.cpp
+++ b/engines/griffon/dialogs.cpp
@@ -561,10 +561,7 @@ void GriffonEngine::saveLoadNew() {
_player.attackSpeed = 1.5f;
_pgardens = false;
- _ptown = false;
_pboss = false;
- _pacademy = false;
- _pcitadel = false;
haltSoundChannel(-1);
diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp
index e2281b3bf1..00aed92a21 100644
--- a/engines/griffon/engine.cpp
+++ b/engines/griffon/engine.cpp
@@ -316,10 +316,7 @@ void GriffonEngine::newGame() {
_player.walkDir = 1;
_pgardens = false;
- _ptown = false;
_pboss = false;
- _pacademy = false;
- _pcitadel = false;
loadMap(2);
diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h
index dfd03da74d..364e769bbb 100644
--- a/engines/griffon/griffon.h
+++ b/engines/griffon/griffon.h
@@ -485,7 +485,6 @@ private:
// music info
DataChunk *_mgardens, *_mgardens2, *_mgardens3, *_mgardens4, *_mboss, *_mmenu, *_mendofgame;
int _musicchannel, _menuchannel;
- bool _ptown, _pacademy, _pcitadel; // CHECKME: They look unused.
bool _pboss;
bool _pgardens;
int _loopseta;
diff --git a/engines/griffon/sound.cpp b/engines/griffon/sound.cpp
index 44373c995f..f80050d014 100644
--- a/engines/griffon/sound.cpp
+++ b/engines/griffon/sound.cpp
@@ -210,9 +210,6 @@ void GriffonEngine::updateMusic() {
_pboss = false;
_pgardens = false;
- _ptown = false;
- _pacademy = false;
- _pcitadel = false;
if (iplaysound == _mboss)
_pboss = true;