From b20670e5645c06c695ad06d6da9dcf7d9e5b0324 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Mon, 20 Nov 2017 10:25:20 -0600
Subject: TSAGE: Remove member access of null pointer

---
 engines/tsage/sound.cpp | 10 +---------
 engines/tsage/sound.h   |  2 --
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 0d3fb55dd3..5787bac414 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -147,10 +147,6 @@ void SoundManager::syncSounds() {
 	}
 }
 
-void SoundManager::update() {
-	sfSoundServer();
-}
-
 Common::List<SoundDriverEntry> &SoundManager::buildDriverList(bool detectFlag) {
 	assert(_sndmgrReady);
 	_availableDrivers.clear();
@@ -544,10 +540,6 @@ void SoundManager::sfUpdateVoiceStructs2() {
 	}
 }
 
-void SoundManager::sfUpdateCallback(void *ref) {
-	((SoundManager *)ref)->update();
-}
-
 /*--------------------------------------------------------------------------*/
 
 void SoundManager::saveNotifier(bool postFlag) {
@@ -3016,7 +3008,7 @@ void AdlibSoundDriver::onTimer() {
 	Common::StackLock slock1(SoundManager::sfManager()._serverDisabledMutex);
 	Common::StackLock slock2(SoundManager::sfManager()._serverSuspendedMutex);
 
-	SoundManager::sfUpdateCallback(NULL);
+	SoundManager::sfSoundServer();
 	flush();
 }
 
diff --git a/engines/tsage/sound.h b/engines/tsage/sound.h
index da56c8bfa5..8215d6ee6e 100644
--- a/engines/tsage/sound.h
+++ b/engines/tsage/sound.h
@@ -196,7 +196,6 @@ public:
 	virtual void listenerSynchronize(Serializer &s);
 	virtual void postInit();
 	void syncSounds();
-	void update();
 
 	static void saveNotifier(bool postFlag);
 	void saveNotifierProc(bool postFlag);
@@ -256,7 +255,6 @@ public:
 	static void sfProcessFading();
 	static void sfUpdateVoiceStructs();
 	static void sfUpdateVoiceStructs2();
-	static void sfUpdateCallback(void *ref);
 };
 
 class Sound: public EventHandler {
-- 
cgit v1.2.3