diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-04 08:45:53 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-04 08:45:53 -0500 |
| commit | 5fadac5d0f37f574ca160107d832d11b421ad559 (patch) | |
| tree | ff9667adf7c3b8d882083a99b7176260afd25349 /include/common.h | |
| parent | fe5ea7fe415857f49d6630f2b0f50e1246c38eee (diff) | |
entity following
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/common.h b/include/common.h index 9650f49..58d561f 100644 --- a/include/common.h +++ b/include/common.h @@ -8,16 +8,17 @@ #ifndef COMMON_H #define COMMON_H +// holy moly #include <iostream> #include <cstdlib> #include <string> #include <vector> -#include <math.h> #include <string> #include <fstream> #include <thread> #include <mutex> #include <future> +#include <math.h> #include <threadpool.h> #define GLEW_STATIC @@ -47,7 +48,7 @@ N abso(N v){ return v; } -extern GLuint colorIndex; +extern GLuint colorIndex; // Texture.cpp? /** * This structure contains a set of coordinates for ease of coding. @@ -104,7 +105,7 @@ typedef col Color; * Define the game's name (displayed in the window title). */ -#define GAME_NAME "Independent Study v.0.5 alpha - NOW WITH SOUND!" +#define GAME_NAME "Independent Study v.0.6 alpha - NOW WITH more c++" /** * The desired width of the game window. |