diff options
| author | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-10 11:51:56 -0400 |
|---|---|---|
| committer | Andy Belle-Isle <abelleisle@roadrunner.com> | 2015-09-10 11:51:56 -0400 |
| commit | 22fd8623af3f57c4e28f43f793bae4d14948abc0 (patch) | |
| tree | c4936680f4cffd0d52e4d96aed39404fdaa30a52 /include/common.h | |
| parent | dfb65f04b8579c9c4e24086452474adcae9b87b7 (diff) | |
| parent | a3db993224c994fdff6f50fedcc266c5e0b94aa8 (diff) | |
Merge remote-tracking branch 'origin/master'
d
Conflicts:
include/World.h
include/common.h
include/entities.h
src/UIClass.cpp
src/World.cpp
src/entities.cpp
src/main.cpp
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index e4de2c5..48a068d 100644 --- a/include/common.h +++ b/include/common.h @@ -1,3 +1,4 @@ +<<<<<<< HEAD #ifndef COMMON_H #define COMMON_H @@ -28,4 +29,37 @@ extern SDL_GLContext mainGLContext; //WINDOW VARIABLES extern bool gameRunning; -#endif // COMMON_H
\ No newline at end of file +#endif // COMMON_H +======= +#ifndef COMMON_H +#define COMMON_H + +typedef struct{float x; float y;}vec2; + +///THIS FILE IS USED FOR VARIABLES THAT WILL BE ACCESED BY MULTIPLE CLASSES/FILES + +#include <iostream> +#include <cstdlib> +#include <SDL2/SDL.h> +#include <SDL2/SDL_image.h> +#include <SDL2/SDL_opengl.h> +#include <UIClass.h> +#include <entities.h> +#include <World.h> + +#define SCREEN_WIDTH 1280 +#define SCREEN_HEIGHT 800 +#define FULLSCREEN + + + +//SDL VARIABLES +extern SDL_Window *window; +extern SDL_Surface *renderSurface; +extern SDL_GLContext mainGLContext; + +//WINODWS VARIABLES +extern bool gameRunning; + +#endif // COMMON_H +>>>>>>> origin/master |