From 814dab606cfeeabd4aeecba852507c3c3f1a005f Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 4 Feb 2016 09:24:25 -0500
Subject: Volume Mixer

---
 include/common.h | 1 +
 include/ui.h     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/common.h b/include/common.h
index ea3b593..0a8ba20 100644
--- a/include/common.h
+++ b/include/common.h
@@ -126,6 +126,7 @@ extern unsigned int HLINE;
 
 extern float VOLUME_MASTER;
 extern float VOLUME_MUSIC;
+extern float VOLUME_SFX;
 /**
  * A 'wrapper' for libc's srand(), as we hope to eventually have our own random number
  * generator.
diff --git a/include/ui.h b/include/ui.h
index 8582460..38a4932 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -12,7 +12,7 @@
 #include <world.h>
 #include <ft2build.h>
 #include <SDL2/SDL_opengl.h>
-#include <fstream>
+#include <thread>
 #include FT_FREETYPE_H
 
 #define DEBUG
-- 
cgit v1.2.3