From 7c12549654f14ebc949884c605329a837720fcbd Mon Sep 17 00:00:00 2001
From: Brandon <brandon@bremaweb.com>
Date: Mon, 29 May 2017 20:52:16 -0500
Subject: [PATCH] Fix more conflicts

---
 src/game.cpp         | 4 ----
 src/sound_openal.cpp | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 829451f3..bc83e932 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2606,10 +2606,6 @@ void Game::processKeyInput()
 				}
 				client->typeChatMessage(narrow_to_wide("/" + kc.command));
 
-				statustext = narrow_to_wide(
-						"Pressed key " + kc.setting_name + " with command " + kc.command);
-// TODO: This used to be needed, but the variable is no longer in scope
-//					statustext_time = 0;
 			}
 		}
 	}
diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index bf5d81a9..1cddbc1f 100644
--- a/src/sound_openal.cpp
+++ b/src/sound_openal.cpp
@@ -283,11 +283,10 @@ private:
 		float step;
 		float current_gain;
 		float target_gain;
-
+	};
 
 	UNORDERED_MAP<int, FadeState> m_sounds_fading;
 	float m_fade_delay;
-
 public:
 	bool m_is_initialized;
 	OpenALSoundManager(OnDemandSoundFetcher *fetcher):
@@ -565,7 +564,6 @@ public:
 	int playSound(const std::string &name, bool loop, float volume, float fade)
 	{
 		maintain();
-		int handle = -1;
 		if(name == "")
 			return 0;
 		SoundBuffer *buf = getFetchBuffer(name);