diff options
author | Andy <drumsetmonkey@gmail.com> | 2017-01-20 10:37:21 -0500 |
---|---|---|
committer | Andy <drumsetmonkey@gmail.com> | 2017-01-20 10:37:21 -0500 |
commit | 4d8f9974156068e4595bf219cacfd9fcd2fd7174 (patch) | |
tree | f3e938c0e49537a9dea661f46eed6ee74950b48a /include/player.hpp | |
parent | 1894e311bdeb098c3bef9bd342e0eaf78d197a9b (diff) | |
parent | 1ac412a5496fb6c63c47f199dfc7facd5f4c080a (diff) |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/player.hpp')
-rw-r--r-- | include/player.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/player.hpp b/include/player.hpp index 85dc821..56886e3 100644 --- a/include/player.hpp +++ b/include/player.hpp @@ -2,16 +2,15 @@ * @file player.hpp * @brief The player system */ - #ifndef PLAYER_HPP_ #define PLAYER_HPP_ #include <entityx/entityx.h> +#include <components.hpp> #include <events.hpp> #include <engine.hpp> -#include <components.hpp> -#include <common.hpp> +#include <vector2.hpp> /** * The constant velocity the player is given when moved with the arrow keys. |