blob: 89d9ec3b7c716822649b763cb84ad20a363be672 (
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
|
<<<<<<< HEAD
#ifndef ENTITIES_H
#define ENTITIES_H
#include <common.h>
class Entities{
public:
float width;
float height;
float speed;
int type;
vec2 loc;
vec2 loci;
vec2 vel;
vec2 velg;
void spawn(float, float);
};
class Player : public Entities{
public:
Player();
~Player();
};
=======
#ifndef ENTITIES_H
#define ENTITIES_H
#include <common.h>
class Entities{
public:
float width;
float height;
float speed;
int type;
vec2 loc;
void spawn(float, float);
};
class Player : public Entities{
public:
Player();
~Player();
};
>>>>>>> origin/master
#endif //ENTITIES_H
|
