blob: 48a068d950d99db0919c2e4bd61aee05e7ba8357 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
<<<<<<< HEAD
#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 720
//#define FULLSCREEN
#define HLINE (2.0f / (SCREEN_WIDTH / 4))
//SDL VARIABLES
extern SDL_Window *window;
extern SDL_Surface *renderSurface;
extern SDL_GLContext mainGLContext;
//WINDOW VARIABLES
extern bool gameRunning;
#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
|
