aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2018-07-29 03:56:20 +0100
committerD G Turner2018-07-29 03:56:20 +0100
commitbdb307634f192966536c8ded58d84cb4ad4ee8c2 (patch)
tree1222bec67abb7273fc8f3423353c967ccd589234
parent733cb7dcc728763b65eab9b11d955e1aa13e16ad (diff)
downloadscummvm-rg350-bdb307634f192966536c8ded58d84cb4ad4ee8c2.tar.gz
scummvm-rg350-bdb307634f192966536c8ded58d84cb4ad4ee8c2.tar.bz2
scummvm-rg350-bdb307634f192966536c8ded58d84cb4ad4ee8c2.zip
LILLIPUT: Remove Unused Engine Pointer from Sound Class.
Since this was unused, it was causing various compiler warnings of the set-but-not-used type. If it is needed later, this code can be restored.
-rw-r--r--engines/lilliput/lilliput.cpp2
-rw-r--r--engines/lilliput/sound.cpp2
-rw-r--r--engines/lilliput/sound.h4
3 files changed, 3 insertions, 5 deletions
diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index e41ec36067..0a842bf1f3 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -132,7 +132,7 @@ LilliputEngine::LilliputEngine(OSystem *syst, const LilliputGameDescription *gd)
_debugFlag2 = 0;
_scriptHandler = new LilliputScript(this);
- _soundHandler = new LilliputSound(this);
+ _soundHandler = new LilliputSound();
_handleOpcodeReturnCode = 0;
_delayedReactivationAction = false;
diff --git a/engines/lilliput/sound.cpp b/engines/lilliput/sound.cpp
index 9045e47c9a..47048e4117 100644
--- a/engines/lilliput/sound.cpp
+++ b/engines/lilliput/sound.cpp
@@ -48,7 +48,7 @@ static const byte _soundType [40] = {
0, 0, 0, 0, 0, 0, 1, 0, 0, 0
};
-LilliputSound::LilliputSound(LilliputEngine *vm) : _vm(vm) {
+LilliputSound::LilliputSound() {
_unpackedFiles = nullptr;
_unpackedSizes = nullptr;
_fileNumb = 0;
diff --git a/engines/lilliput/sound.h b/engines/lilliput/sound.h
index f56fd58a6f..ebb49a8bc7 100644
--- a/engines/lilliput/sound.h
+++ b/engines/lilliput/sound.h
@@ -36,7 +36,7 @@ class LilliputEngine;
class LilliputSound: public Audio::MidiPlayer {
public:
- LilliputSound(LilliputEngine *vm);
+ LilliputSound();
~LilliputSound();
void init();
@@ -48,8 +48,6 @@ public:
void remove();
private:
- LilliputEngine *_vm;
-
int _fileNumb;
byte **_unpackedFiles;
uint16 *_unpackedSizes;