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/systems/playing.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/systems/playing.h')
| -rw-r--r-- | src/systems/playing.h | 4 |
1 files changed, 2 insertions, 2 deletions
| diff --git a/src/systems/playing.h b/src/systems/playing.h index 9ba403b..31f79ab 100644 --- a/src/systems/playing.h +++ b/src/systems/playing.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define PLAYING_H_70A54F7D | 2 | #define PLAYING_H_70A54F7D |
| 3 | 3 | ||
| 4 | #include "system.h" | 4 | #include "system.h" |
| 5 | #include "vector.h" | ||
| 5 | 6 | ||
| 6 | class PlayingSystem : public System { | 7 | class PlayingSystem : public System { |
| 7 | public: | 8 | public: |
| @@ -15,8 +16,7 @@ public: | |||
| 15 | void changeMap( | 16 | void changeMap( |
| 16 | id_type player, | 17 | id_type player, |
| 17 | size_t mapId, | 18 | size_t mapId, |
| 18 | double x, | 19 | vec2d warpPos); |
| 19 | double y); | ||
| 20 | 20 | ||
| 21 | void die(id_type player); | 21 | void die(id_type player); |
| 22 | 22 | ||