diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/mappable.h | 10 | ||||
-rw-r--r-- | src/components/playable.h | 15 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/components/mappable.h b/src/components/mappable.h index 2dbab77..633cdf4 100644 --- a/src/components/mappable.h +++ b/src/components/mappable.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <map> | 4 | #include <map> |
5 | #include "component.h" | 5 | #include "component.h" |
6 | #include "renderer/texture.h" | 6 | #include "renderer/texture.h" |
7 | #include "collision.h" | ||
7 | #include "map.h" | 8 | #include "map.h" |
8 | 9 | ||
9 | class MappableComponent : public Component { | 10 | class MappableComponent : public Component { |
@@ -12,14 +13,7 @@ public: | |||
12 | class Boundary { | 13 | class Boundary { |
13 | public: | 14 | public: |
14 | 15 | ||
15 | enum class Type { | 16 | using Type = Collision::Type; |
16 | wall, | ||
17 | wrap, | ||
18 | teleport, | ||
19 | reverse, | ||
20 | platform, | ||
21 | danger | ||
22 | }; | ||
23 | 17 | ||
24 | Boundary( | 18 | Boundary( |
25 | double axis, | 19 | double axis, |
diff --git a/src/components/playable.h b/src/components/playable.h new file mode 100644 index 0000000..a6e71b0 --- /dev/null +++ b/src/components/playable.h | |||
@@ -0,0 +1,15 @@ | |||
1 | #ifndef PLAYABLE_H_DDC566C3 | ||
2 | #define PLAYABLE_H_DDC566C3 | ||
3 | |||
4 | #include "component.h" | ||
5 | |||
6 | class PlayableComponent : public Component { | ||
7 | public: | ||
8 | |||
9 | bool changingMap = false; | ||
10 | int newMapId = -1; | ||
11 | double newMapX = 0; | ||
12 | double newMapY = 0; | ||
13 | }; | ||
14 | |||
15 | #endif /* end of include guard: PLAYABLE_H_DDC566C3 */ | ||