diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-27 08:50:07 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-27 08:50:07 -0400 |
| commit | 174bcd3a415c21fc2c59a3af1b6333faa78b37d0 (patch) | |
| tree | d2f9c9fe8a79628fb95557acb2a0bc03aedb07e3 /include/common.hpp | |
| parent | 88c21e763178856aef0155595d49085919205951 (diff) | |
ui fixes, other stuff
Diffstat (limited to 'include/common.hpp')
| -rw-r--r-- | include/common.hpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/include/common.hpp b/include/common.hpp index 5a0fcb2..1f7b9fc 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -18,8 +18,7 @@ #include <thread> #include <mutex> #include <future> -#include <math.h> -#include <threadpool.hpp> +#include <cmath> #include <algorithm> #define GLEW_STATIC @@ -153,19 +152,6 @@ typedef col Color; #define GAME_NAME "Independent Study v0.7 alpha - NOW WITH lights and snow and stuff" -/** - * The desired width of the game window. - */ - -extern unsigned int SCREEN_WIDTH; - -/** - * The desired height of the game window. - */ - -extern unsigned int SCREEN_HEIGHT; - -extern bool FULLSCREEN; extern bool uiLoop; extern std::mutex mtx; @@ -179,13 +165,8 @@ extern std::mutex mtx; * */ -#define HLINES(n) (HLINE * n) - -extern unsigned int HLINE; +#define HLINES(n) (game::HLINE * n) -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. |