Changed folder structure, moved files.

source/Game.cpp

@@ -9,13 +9,13 @@
 
 #include <Thor/Graphics.hpp>
 
-#include "util/Instances.h"
 #include "abstract/Character.h"
-#include "sprite/Cover.h"
+#include "sprites/Cover.h"
-#include "sprite/Enemy.h"
+#include "sprites/Enemy.h"
+#include "types/Instances.h"
+#include "types/String.h"
 #include "util/Loader.h"
 #include "util/ResourceManager.h"
-#include "util/String.h"
 
 /// Goal amount of frames per second.
 const int Game::FPS_GOAL = 60;

source/Game.h

@@ -15,11 +15,11 @@
 
 #include <Box2D/Box2D.h>
 
-#include "Pathfinder.h"
+#include "sprites/TileManager.h"
-#include "TileManager.h"
+#include "sprites/Player.h"
-#include "sprite/Player.h"
+#include "types/String.h"
 #include "util/Collection.h"
-#include "util/String.h"
+#include "util/Pathfinder.h"
 
 class Player;
 class Collection;

source/abstract/Character.cpp

@@ -12,7 +12,7 @@
 
 #include <Thor/Vectors.hpp>
 
-#include "../sprite/Body.h"
+#include "../sprites/Body.h"
 #include "../util/Log.h"
 
 const String Character::KEY_HEALTH = "health";

source/abstract/Character.h

@@ -12,8 +12,8 @@
 
 #include "Sprite.h"
 #include "../items/Weapon.h"
-#include "../util/Instances.h"
+#include "../types/Instances.h"
-#include "../util/String.h"
+#include "../types/String.h"
 #include "../util/Yaml.h"
 
 class Weapon;

source/abstract/Physical.h

@@ -10,8 +10,8 @@
 
 #include <Box2D/Box2D.h>
 
-#include "../util/String.h"
+#include "../types/String.h"
-#include "../util/Vector.h"
+#include "../types/Vector.h"
 #include "../util/Yaml.h"
 
 class Yaml;

source/abstract/Sprite.h

@@ -13,8 +13,8 @@
 #include <Thor/Resources.hpp>
 
 #include "Physical.h"
-#include "../util/String.h"
+#include "../types/String.h"
-#include "../util/Vector.h"
+#include "../types/Vector.h"
 #include "../util/Yaml.h"
 
 class Physical;

source/effects/Bullet.h

@@ -9,7 +9,7 @@
 #define DG_BULLET_H_
 
 #include "../particle/Particle.h"
-#include "../util/String.h"
+#include "../types/String.h"
 #include "../util/Yaml.h"
 
 class Particle;

source/items/Weapon.h

@@ -10,9 +10,9 @@
 
 #include <Thor/Particles.hpp>
 
-#include "../util/Instances.h"
 #include "../abstract/Physical.h"
 #include "../particle/Emitter.h"
+#include "../types/Instances.h"
 #include "../util/Yaml.h"
 
 class Emitter;

source/sprites/Enemy.h

@@ -8,10 +8,10 @@
 #ifndef DG_ENEMY_H_
 #define DG_ENEMY_H
 
-#include "../util/Instances.h"
+#include "../types/Instances.h"
 #include "../abstract/Character.h"
 #include "../util/Collection.h"
-#include "../util/Vector.h"
+#include "../types/Vector.h"
 #include "../util/Yaml.h"
 
 class Character;

source/sprites/Player.cpp

@@ -9,9 +9,9 @@
 
 #include <Thor/Vectors.hpp>
 
-#include "../util/Vector.h"
 #include "../items/Weapon.h"
-#include "../util/String.h"
+#include "../types/String.h"
+#include "../types/Vector.h"
 
 /**
  * Initializes Sprite.

source/sprites/Player.h

@@ -11,11 +11,11 @@
 #include <SFML/System.hpp>
 #include <SFML/Graphics.hpp>
 
-#include "../util/Instances.h"
-#include "../Pathfinder.h"
 #include "../abstract/Character.h"
 #include "../items/Weapon.h"
-#include "../util/Vector.h"
+#include "../types/Instances.h"
+#include "../types/Vector.h"
+#include "../util/Pathfinder.h"
 #include "../util/Yaml.h"
 
 class Character;

source/sprites/TileManager.cpp

@@ -9,10 +9,10 @@
 
 #include <Thor/Resources.hpp>
 
-#include "abstract/Sprite.h"
+#include "../abstract/Sprite.h"
-#include "util/Loader.h"
+#include "../types/String.h"
-#include "util/ResourceManager.h"
+#include "../util/Loader.h"
-#include "util/String.h"
+#include "../util/ResourceManager.h"
 
 const Vector2i TileManager::TILE_SIZE = Vector2i(100, 100);
 

source/sprites/TileManager.h

@@ -14,9 +14,9 @@
 
 #include <Box2D/Box2D.h>
 
-#include "util/Vector.h"
+#include "../abstract/Sprite.h"
-#include "abstract/Sprite.h"
+#include "../types/Vector.h"
-#include "util/String.h"
+#include "../types/String.h"
 
 class Sprite;
 

source/types/Instances.h

@@ -10,9 +10,9 @@
 
 #include <Box2D/Box2D.h>
 
-#include "../Pathfinder.h"
+#include "../sprites/TileManager.h"
-#include "../TileManager.h"
+#include "../util/Collection.h"
-#include "Collection.h"
+#include "../util/Pathfinder.h"
 
 class Pathfinder;
 class TileManager;

source/util/Loader.h

@@ -16,7 +16,7 @@
 
 #include <Thor/Resources.hpp>
 
-#include "Singleton.h"
+#include "../abstract/Singleton.h"
 
 template <class T>
 class Singleton;

source/util/Log.h

@@ -10,7 +10,7 @@
 
 #include <iostream>
 
-#include "Vector.h"
+#include "../types/Vector.h"
 
 /**
  * Logging functions for different levels.

source/util/Pathfinder.cpp

@@ -23,8 +23,7 @@
 #include <boost/graph/filtered_graph.hpp>
 #include <boost/graph/astar_search.hpp>
 
-#include "util/Log.h"
+#include "../util/Log.h"
-#include <typeinfo>
 
 // Boost interface type declarations.
 enum class Direction;

source/util/Pathfinder.h

@@ -10,8 +10,8 @@
 
 #include <Box2D/Box2D.h>
 
-#include "abstract/Physical.h"
+#include "../abstract/Physical.h"
-#include "util/Vector.h"
+#include "../types/Vector.h"
 
 /**
  * Interface class for Boost Graph A* library.

source/util/ResourceManager.h

@@ -12,7 +12,7 @@
 
 #include <Thor/Resources.hpp>
 
-#include "Singleton.h"
+#include "../abstract/Singleton.h"
 
 template <class T>
 class Singleton;

source/util/Yaml.h

@@ -12,8 +12,8 @@
 
 #include <yaml-cpp/yaml.h>
 
-#include "String.h"
+#include "../types/String.h"
-#include "Vector.h"
+#include "../types/Vector.h"
 
 namespace details {};