diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 3 | ||||
| -rw-r--r-- | include/entities.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/common.h b/include/common.h index b2ef8a3..2cf98e4 100644 --- a/include/common.h +++ b/include/common.h @@ -8,9 +8,10 @@ #include <math.h> #include <cstdlib> #include <SDL2/SDL.h> +#include <GL/glew.h> +#include <SDL2/SDL_opengl.h> #include <SDL2/SDL_image.h> #include <SDL2/SDL_mixer.h> -#include <SDL2/SDL_opengl.h> typedef struct { float x; float y; }vec2; diff --git a/include/entities.h b/include/entities.h index fc2f35c..5b6bcf1 100644 --- a/include/entities.h +++ b/include/entities.h @@ -100,7 +100,3 @@ ENTITY TYPES <<<<<<< HEAD |->1 Rabbit **/ -======= -|->1 Skirl -**/ ->>>>>>> 58716d5e4f20eb5a30025c88fe5119a0e40c4187 |