diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.hpp | 17 | ||||
| -rw-r--r-- | include/config.hpp | 2 | ||||
| -rw-r--r-- | include/shader_utils.hpp | 14 | ||||
| -rw-r--r-- | include/world.hpp | 7 |
4 files changed, 8 insertions, 32 deletions
diff --git a/include/common.hpp b/include/common.hpp index 7028296..56928b5 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -43,11 +43,8 @@ // game library includes #include <config.hpp> - - // windows stuff #ifdef __WIN32__ -typedef unsigned int uint; #undef near #endif @@ -192,8 +189,6 @@ public: } }; -extern GLuint colorIndex; - /** * The amount of game ticks that should occur each second. */ @@ -259,17 +254,6 @@ extern vec2 offset; */ void DEBUG_prints(const char* file, int line, const char *s,...); -// TODO make sure we don't use these. Then burn them. -/** - * Sets color using glColor3ub(), but handles potential overflow. - */ -void safeSetColor(int r,int g,int b); - -/** - * Sets color using glColor4ub(), but handles potential overflow. - */ -void safeSetColorA(int r,int g,int b,int a); - unsigned int millis(void); // reads the names of files in a directory into the given string vector @@ -279,7 +263,6 @@ int getdir(std::string dir, std::vector<std::string> &files); void strVectorSortAlpha(std::vector<std::string> *v); // reads the given file into a buffer and returns a pointer to the buffer -const char *readFile(const char *path); std::string readFile(const std::string& path); std::vector<std::string> readFileA(const std::string& path); diff --git a/include/config.hpp b/include/config.hpp index 908c376..e17df24 100644 --- a/include/config.hpp +++ b/include/config.hpp @@ -29,7 +29,7 @@ namespace game { /** * The window is fullscreen if this is true. */ - extern bool FULLSCREEN; + extern bool FULLSCREEN; namespace config { /** diff --git a/include/shader_utils.hpp b/include/shader_utils.hpp index 08ca7b3..06ac318 100644 --- a/include/shader_utils.hpp +++ b/include/shader_utils.hpp @@ -14,12 +14,12 @@ #include <SDL2/SDL.h> -extern char* file_read(const char* filename); -extern void print_log(GLuint object); -extern GLuint create_shader(const char* filename, GLenum type); -extern GLuint create_program(const char* vertexfile, const char *fragmentfile); -extern GLint get_attrib(GLuint program, const char *name); -extern GLint get_uniform(GLuint program, const char *name); -extern void print_opengl_info(); +char* file_read(const char* filename); +void print_log(GLuint object); +GLuint create_shader(const char* filename, GLenum type); +GLuint create_program(const char* vertexfile, const char *fragmentfile); +GLint get_attrib(GLuint program, const char *name); +GLint get_uniform(GLuint program, const char *name); +void print_opengl_info(); #endif diff --git a/include/world.hpp b/include/world.hpp index 8b24987..8864d30 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -60,13 +60,6 @@ typedef struct { } WorldData; /** - * Alters how bright world elements are drawn. - * This value is based off of the current time of day (tick count), set in - * main.cpp. - */ -extern int worldShade; - -/** * Defines how many game ticks it takes to go from day to night or vice versa. * Technically a half day cycle... */ |