diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-08 21:09:36 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-05-09 17:59:13 -0400 |
| commit | 5c82f052c26303318e81ddd76475c1d188cc74f4 (patch) | |
| tree | 3204ef94f2861224a380aa566728c02b4acd1fd9 /src/components/realizable.h | |
| parent | 96e6f3231aed9919d660a06944f1d96dc8241f8e (diff) | |
| download | therapy-5c82f052c26303318e81ddd76475c1d188cc74f4.tar.gz therapy-5c82f052c26303318e81ddd76475c1d188cc74f4.tar.bz2 therapy-5c82f052c26303318e81ddd76475c1d188cc74f4.zip | |
Simplified positions/sizes with vectors
Positions and sizes are now stored as vectors (of doubles and ints, respectively). This allows for at least minor code simplification in many places, and cleans up the CollisionParams code in PonderingSystem quite a bit.
Diffstat (limited to 'src/components/realizable.h')
| -rw-r--r-- | src/components/realizable.h | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/src/components/realizable.h b/src/components/realizable.h index 0858e7a..b749aeb 100644 --- a/src/components/realizable.h +++ b/src/components/realizable.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include <set> | 5 | #include <set> |
| 6 | #include <map> | 6 | #include <map> |
| 7 | #include "entity_manager.h" | 7 | #include "entity_manager.h" |
| 8 | #include "vector.h" | ||
| 8 | 9 | ||
| 9 | class RealizableComponent : public Component { | 10 | class RealizableComponent : public Component { |
| 10 | public: | 11 | public: |
| @@ -31,8 +32,7 @@ public: | |||
| 31 | * @managed_by RealizingSystem | 32 | * @managed_by RealizingSystem |
| 32 | */ | 33 | */ |
| 33 | int startingMapId; | 34 | int startingMapId; |
| 34 | int startingX; | 35 | vec2i startingPos; |
| 35 | int startingY; | ||
| 36 | 36 | ||
| 37 | /** | 37 | /** |
| 38 | * The set of map entities loaded by this entity. It is only intended for | 38 | * The set of map entities loaded by this entity. It is only intended for |