[Scummvm-git-logs] scummvm master -> bdb307634f192966536c8ded58d84cb4ad4ee8c2

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bdb307634f LILLIPUT: Remove Unused Engine Pointer from Sound Class.


Commit: bdb307634f192966536c8ded58d84cb4ad4ee8c2
    https://github.com/scummvm/scummvm/commit/bdb307634f192966536c8ded58d84cb4ad4ee8c2
Author: D G Turner (digitall at scummvm.org)
Date: 2018-07-29T03:56:20+01:00

Commit Message:
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.

Changed paths:
    engines/lilliput/lilliput.cpp
    engines/lilliput/sound.cpp
    engines/lilliput/sound.h


diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index e41ec36..0a842bf 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 9045e47..47048e4 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 f56fd58..ebb49a8 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;