From 174bcd3a415c21fc2c59a3af1b6333faa78b37d0 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 27 Apr 2016 08:50:07 -0400
Subject: ui fixes, other stuff

---
 include/config.hpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'include/config.hpp')

diff --git a/include/config.hpp b/include/config.hpp
index 8bd0bc9..bc9d052 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -1,18 +1,25 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include <iostream>
+#include <string>
 
-#include <SDL2/SDL_mixer.h>
+namespace game {
+	extern unsigned int HLINE;
+	extern unsigned int SCREEN_WIDTH;
+	extern unsigned int SCREEN_HEIGHT;
+	extern bool         FULLSCREEN;
 
-#include <tinyxml2.h>
-#include <ui.hpp>
+	namespace config {
+		extern float VOLUME_MASTER;
+		extern float VOLUME_MUSIC;
+		extern float VOLUME_SFX;
 
-
-namespace config {
-    void read(void);
-    void update(void);
-    void save(void);
+		extern std::string xmlFolder;
+		
+		void read(void);
+		void update(void);
+		void save(void);
+	}
 }
 
 #endif //CONFIG_H
-- 
cgit v1.2.3