8 files changed, 23 insertions, 17 deletions
diff --git a/src/components.cpp b/src/components.cpp
index ba4fe72..e41e2cd 100644
--- a/src/components.cpp
+++ b/src/components.cpp

@@ -1,6 +1,7 @@
 #include "components.h"
 #include "game.h"
 #include "muxer.h"
+#include "map.h"
 // User movement component
diff --git a/src/components.h b/src/components.h
index 3d80d1a..2ec19ff 100644
--- a/src/components.h
+++ b/src/components.h

@@ -1,11 +1,13 @@
 #ifndef COMPONENTS_H
 #define COMPONENTS_H
-#include "entity.h"
 #include <utility>
 #include <list>
-#include "map.h"
+#include "renderer.h"
-#include <memory>
+#include "entity.h"
+#include "game.h"
+class Map;
 class UserMovementComponent : public Component {
  public:
@@ -33,7 +35,7 @@ class PlayerSpriteComponent : public Component {
    void receive(Game& game, Entity& entity, const Message& msg);
    
  private:
-    Texture sprite{"../res/Starla.png"};
+    Texture sprite {"../res/Starla.png"};
    int animFrame = 0;
    bool facingLeft = false;
    bool isMoving = false;
diff --git a/src/entity.h b/src/entity.h
index 44ce973..26febfb 100644
--- a/src/entity.h
+++ b/src/entity.h

@@ -1,13 +1,13 @@
 #ifndef ENTITY_H
 #define ENTITY_H
-class Entity;
-class Component;
 #include <list>
 #include "renderer.h"
-#include "game.h"
-#include "map.h"
+class Game;
+class Map;
+class Entity;
+class Component;
 class Message {
  public:
diff --git a/src/entityfactory.cpp b/src/entityfactory.cpp
index acf9b8e..3fcb9ed 100644
--- a/src/entityfactory.cpp
+++ b/src/entityfactory.cpp

@@ -3,6 +3,7 @@
 #include "components.h"
 #include "muxer.h"
 #include <cstdio>
+#include <map>
 struct EntityData {
  char* sprite;
diff --git a/src/entityfactory.h b/src/entityfactory.h
index a35b5f7..7b8f399 100644
--- a/src/entityfactory.h
+++ b/src/entityfactory.h

@@ -1,11 +1,10 @@
 #ifndef ENTITYFACTORY_H
 #define ENTITYFACTORY_H
-#include "entity.h"
-#include <memory>
 #include <string>
-#include <map>
-#include "map.h"
+class Entity;
+class Map;
 class EntityFactory {
  public:
diff --git a/src/game.cpp b/src/game.cpp
index 1ff3f4f..68c0a13 100644
--- a/src/game.cpp
+++ b/src/game.cpp

@@ -3,6 +3,7 @@
 #include "components.h"
 #include "muxer.h"
 #include "entityfactory.h"
+#include "map.h"
 Game::Game()
 { 
diff --git a/src/game.h b/src/game.h
index ab8b906..065aca8 100644
--- a/src/game.h
+++ b/src/game.h

@@ -1,12 +1,13 @@
 #ifndef GAME_H
 #define GAME_H
-class Game;
-#include "map.h"
 #include <memory>
-#include "entity.h"
 #include <functional>
+#include "renderer.h"
+#include <list>
+class Entity;
+class Map;
 const int TILE_WIDTH = 8;
 const int TILE_HEIGHT = 8;
diff --git a/src/map.cpp b/src/map.cpp
index 8c1c6f0..2be5071 100644
--- a/src/map.cpp
+++ b/src/map.cpp

@@ -5,6 +5,7 @@
 #include <libxml/parser.h>
 #include <map>
 #include "entityfactory.h"
+#include "entity.h"
 static std::map<std::string, Map> maps;

diff --git a/src/components.cpp b/src/components.cpp index ba4fe72..e41e2cd 100644 --- a/src/components.cpp +++ b/src/components.cpp
@@ -1,6 +1,7 @@
1	#include "components.h"	1	#include "components.h"
2	#include "game.h"	2	#include "game.h"
3	#include "muxer.h"	3	#include "muxer.h"
		4	#include "map.h"
4		5
5	// User movement component	6	// User movement component
6		7


diff --git a/src/components.h b/src/components.h index 3d80d1a..2ec19ff 100644 --- a/src/components.h +++ b/src/components.h
@@ -1,11 +1,13 @@
1	#ifndef COMPONENTS_H	1	#ifndef COMPONENTS_H
2	#define COMPONENTS_H	2	#define COMPONENTS_H
3		3
4	#include "entity.h"
5	#include <utility>	4	#include <utility>
6	#include <list>	5	#include <list>
7	#include "map.h"	6	#include "renderer.h"
8	#include <memory>	7	#include "entity.h"
		8	#include "game.h"
		9
		10	class Map;
9		11
10	class UserMovementComponent : public Component {	12	class UserMovementComponent : public Component {
11	public:	13	public:
@@ -33,7 +35,7 @@ class PlayerSpriteComponent : public Component {
33	void receive(Game& game, Entity& entity, const Message& msg);	35	void receive(Game& game, Entity& entity, const Message& msg);
34		36
35	private:	37	private:
36	Texture sprite{"../res/Starla.png"};	38	Texture sprite {"../res/Starla.png"};
37	int animFrame = 0;	39	int animFrame = 0;
38	bool facingLeft = false;	40	bool facingLeft = false;
39	bool isMoving = false;	41	bool isMoving = false;


diff --git a/src/entity.h b/src/entity.h index 44ce973..26febfb 100644 --- a/src/entity.h +++ b/src/entity.h
@@ -1,13 +1,13 @@
1	#ifndef ENTITY_H	1	#ifndef ENTITY_H
2	#define ENTITY_H	2	#define ENTITY_H
3		3
4	class Entity;
5	class Component;
6
7	#include <list>	4	#include <list>
8	#include "renderer.h"	5	#include "renderer.h"
9	#include "game.h"	6
10	#include "map.h"	7	class Game;
		8	class Map;
		9	class Entity;
		10	class Component;
11		11
12	class Message {	12	class Message {
13	public:	13	public:


diff --git a/src/entityfactory.cpp b/src/entityfactory.cpp index acf9b8e..3fcb9ed 100644 --- a/src/entityfactory.cpp +++ b/src/entityfactory.cpp
@@ -3,6 +3,7 @@
3	#include "components.h"	3	#include "components.h"
4	#include "muxer.h"	4	#include "muxer.h"
5	#include <cstdio>	5	#include <cstdio>
		6	#include <map>
6		7
7	struct EntityData {	8	struct EntityData {
8	char* sprite;	9	char* sprite;


diff --git a/src/entityfactory.h b/src/entityfactory.h index a35b5f7..7b8f399 100644 --- a/src/entityfactory.h +++ b/src/entityfactory.h
@@ -1,11 +1,10 @@
1	#ifndef ENTITYFACTORY_H	1	#ifndef ENTITYFACTORY_H
2	#define ENTITYFACTORY_H	2	#define ENTITYFACTORY_H
3		3
4	#include "entity.h"
5	#include <memory>
6	#include <string>	4	#include <string>
7	#include <map>	5
8	#include "map.h"	6	class Entity;
		7	class Map;
9		8
10	class EntityFactory {	9	class EntityFactory {
11	public:	10	public:


diff --git a/src/game.cpp b/src/game.cpp index 1ff3f4f..68c0a13 100644 --- a/src/game.cpp +++ b/src/game.cpp
@@ -3,6 +3,7 @@
3	#include "components.h"	3	#include "components.h"
4	#include "muxer.h"	4	#include "muxer.h"
5	#include "entityfactory.h"	5	#include "entityfactory.h"
		6	#include "map.h"
6		7
7	Game::Game()	8	Game::Game()
8	{	9	{


diff --git a/src/game.h b/src/game.h index ab8b906..065aca8 100644 --- a/src/game.h +++ b/src/game.h
@@ -1,12 +1,13 @@
1	#ifndef GAME_H	1	#ifndef GAME_H
2	#define GAME_H	2	#define GAME_H
3		3
4	class Game;
5
6	#include "map.h"
7	#include <memory>	4	#include <memory>
8	#include "entity.h"
9	#include <functional>	5	#include <functional>
		6	#include "renderer.h"
		7	#include <list>
		8
		9	class Entity;
		10	class Map;
10		11
11	const int TILE_WIDTH = 8;	12	const int TILE_WIDTH = 8;
12	const int TILE_HEIGHT = 8;	13	const int TILE_HEIGHT = 8;


diff --git a/src/map.cpp b/src/map.cpp index 8c1c6f0..2be5071 100644 --- a/src/map.cpp +++ b/src/map.cpp
@@ -5,6 +5,7 @@
5	#include <libxml/parser.h>	5	#include <libxml/parser.h>
6	#include <map>	6	#include <map>
7	#include "entityfactory.h"	7	#include "entityfactory.h"
		8	#include "entity.h"
8		9
9	static std::map<std::string, Map> maps;	10	static std::map<std::string, Map> maps;
10		11