[Scummvm-git-logs] scummvm master -> 78c48fd9df3ea9c332e7c0b57588dcc35da7a28e

[dreammaster]

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:
78c48fd9df AGS: Remove unused private members and globals


Commit: 78c48fd9df3ea9c332e7c0b57588dcc35da7a28e
    https://github.com/scummvm/scummvm/commit/78c48fd9df3ea9c332e7c0b57588dcc35da7a28e
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-04-09T19:18:07-07:00

Commit Message:
AGS: Remove unused private members and globals

Detected by Clang.

Changed paths:
    engines/ags/ags.cpp
    engines/ags/music.cpp
    engines/ags/music.h
    engines/ags/plugins/ags_flashlight/ags_flashlight.cpp
    engines/ags/shared/util/filestream.cpp
    engines/ags/shared/util/filestream.h


diff --git a/engines/ags/ags.cpp b/engines/ags/ags.cpp
index 3b20163f19..2ffc42109b 100644
--- a/engines/ags/ags.cpp
+++ b/engines/ags/ags.cpp
@@ -79,7 +79,7 @@ AGSEngine::AGSEngine(OSystem *syst, const AGSGameDescription *gameDesc) : Engine
 	DebugMan.addDebugChannel(kDebugScan, "Scan", "Scan for unrecognised games");
 
 	_events = new EventsManager();
-	_music = new Music(_mixer);
+	_music = new Music();
 	_globals = new ::AGS3::Globals();
 
 	Common::String forceAA;
diff --git a/engines/ags/music.cpp b/engines/ags/music.cpp
index b999af2843..9d43e78e17 100644
--- a/engines/ags/music.cpp
+++ b/engines/ags/music.cpp
@@ -29,8 +29,7 @@ namespace AGS {
 
 Music *g_music;
 
-Music::Music(Audio::Mixer *mixer) :
-		Audio::MidiPlayer(), _mixer(mixer) {
+Music::Music() {
 	g_music = this;
 	Audio::MidiPlayer::createDriver();
 
diff --git a/engines/ags/music.h b/engines/ags/music.h
index fa1af52d33..a400edab69 100644
--- a/engines/ags/music.h
+++ b/engines/ags/music.h
@@ -32,14 +32,13 @@ namespace AGS {
 
 class Music : public Audio::MidiPlayer {
 private:
-	Audio::Mixer *_mixer;
 	Audio::SoundHandle _soundHandle;
 	Common::Array<byte> _midiData;
 protected:
 	// Overload Audio::MidiPlayer method
 	void sendToChannel(byte channel, uint32 b) override;
 public:
-	Music(Audio::Mixer *mixer);
+	Music();
 	~Music() override;
 
 	/**
diff --git a/engines/ags/plugins/ags_flashlight/ags_flashlight.cpp b/engines/ags/plugins/ags_flashlight/ags_flashlight.cpp
index bf1588ded7..f6df997789 100644
--- a/engines/ags/plugins/ags_flashlight/ags_flashlight.cpp
+++ b/engines/ags/plugins/ags_flashlight/ags_flashlight.cpp
@@ -32,7 +32,6 @@ namespace AGSFlashlight {
 const uint32 Magic = 0xBABE0000;
 const uint32 Version = 2;
 const uint32 SaveMagic = Magic + Version;
-const float PI = 3.14159265f;
 
 int32 AGSFlashlight::AGSFlashlight::screen_width = 320;
 int32 AGSFlashlight::screen_height = 200;
diff --git a/engines/ags/shared/util/filestream.cpp b/engines/ags/shared/util/filestream.cpp
index bec535f6a6..e4353273c1 100644
--- a/engines/ags/shared/util/filestream.cpp
+++ b/engines/ags/shared/util/filestream.cpp
@@ -35,7 +35,7 @@ namespace Shared {
 FileStream::FileStream(const String &file_name, FileOpenMode open_mode, FileWorkMode work_mode,
 	DataEndianess stream_endianess)
 		: DataStream(stream_endianess), _writeBuffer(DisposeAfterUse::YES),
-		_openMode(open_mode), _workMode(work_mode), _file(nullptr), _outSave(nullptr) {
+		_workMode(work_mode), _file(nullptr), _outSave(nullptr) {
 	Open(file_name, open_mode, work_mode);
 }
 
diff --git a/engines/ags/shared/util/filestream.h b/engines/ags/shared/util/filestream.h
index ff9994c111..6258c1391e 100644
--- a/engines/ags/shared/util/filestream.h
+++ b/engines/ags/shared/util/filestream.h
@@ -71,7 +71,6 @@ private:
 	void            Open(const String &file_name, FileOpenMode open_mode, FileWorkMode work_mode);
 
 	Common::Stream *_file;
-	const FileOpenMode  _openMode;
 	const FileWorkMode  _workMode;
 	Common::MemoryWriteStreamDynamic _writeBuffer;
 	Common::OutSaveFile *_outSave;