Removed Building and GameStructures modules. Restructured SW for Unit and Player, still a lot TODO

1 files changed, 11 insertions, 4 deletions

diff --git a/System.h b/System.h
index ec86a2b..421183a 100644
--- a/System.h
+++ b/System.h
@@ -11,7 +11,6 @@ extern "C"
  * **************************************/
 
 #include "Global_Inc.h"
-#include "GameStructures.h"
 
 /* **************************************
  * 	Defines								*
@@ -33,6 +32,14 @@ typedef struct t_Timer
 	void (*Timeout_Callback)(void);
 }TYPE_TIMER;
 
+typedef struct t_CollisionBlock
+{
+	uint16_t x;
+	uint16_t y;
+	uint8_t w;
+	uint8_t h;
+}TYPE_COLLISION_BLOCK;
+
 /* **************************************
  * 	Global Prototypes					*
  * **************************************/
@@ -60,7 +67,7 @@ uint64_t SystemGetGlobalTimer(void);
 // Returns whether critical section of code is being entered
 bool SystemIsBusy(void);
 // Returns whether indicated value is contained inside buffer
-bool SystemContains_u8(uint8_t value, uint8_t * buffer, size_t sz);
+bool SystemContains_u8(uint8_t value, uint8_t* buffer, size_t sz);
 // Overload for uint16_t
 bool SystemContains_u16(uint16_t value, uint16_t * buffer, size_t sz);
 // Creates a timer instance wiht a determined value and associates it to a callback
@@ -80,9 +87,9 @@ bool SystemArrayCompare(unsigned short * arr1, unsigned short * arr2, size_t sz)
 bool SystemCollisionCheck(TYPE_COLLISION_BLOCK c1, TYPE_COLLISION_BLOCK c2);
 
 /* **************************************
- * 	Global Variables					*	
+ * 	Global Variables					*
  * **************************************/
- 
+
 #ifdef __cplusplus
 }
 #endif