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/world.hpp | |
| parent | 1894e311bdeb098c3bef9bd342e0eaf78d197a9b (diff) | |
| parent | 1ac412a5496fb6c63c47f199dfc7facd5f4c080a (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/world.hpp')
| -rw-r--r-- | include/world.hpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/include/world.hpp b/include/world.hpp index 9b68314..fe7d819 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -2,23 +2,24 @@ * @file world.hpp * @brief The world system */ +#ifndef WORLD_HPP_ +#define WORLD_HPP_ -#ifndef WORLD_H -#define WORLD_H +#include <string> +#include <thread> +#include <vector> -// library includes +#include <SDL2/SDL_mixer.h> #include <entityx/entityx.h> -// local game includes -#include <common.hpp> -#include <coolarray.hpp> -#include <events.hpp> -#include <texture.hpp> -#include <components.hpp> #include <tinyxml2.h> - using namespace tinyxml2; +#include <components.hpp> +#include <events.hpp> +#include <texture.hpp> +#include <vector2.hpp> + /** * The background type enum. * Used to choose which set of background images should be used. @@ -178,4 +179,4 @@ public: void load(const std::string& file); }; -#endif // WORLD_H +#endif // WORLD_HPP_ |