* TYPE_BUILDING_ID and TYPE_UNIT_ID partially implemented

Building.h

@@ -23,20 +23,15 @@ extern "C"
  * 	Structs and enums					*
  * **************************************/
  
-enum
-{
-	BARRACKS 	= 0	,
-	TOWER			,
-};
  
 /* **************************************
  * 	Global prototypes					*
  * **************************************/
  
 void BuildingInit(void);
-uint8_t BuildingGetHpFromID(uint8_t id);
-uint8_t BuildingGetWidthFromID(uint8_t id);
-uint8_t BuildingGetHeightFromID(uint8_t id);
+uint8_t BuildingGetHpFromID(TYPE_BUILDING_ID id);
+uint8_t BuildingGetWidthFromID(TYPE_BUILDING_ID id);
+uint8_t BuildingGetHeightFromID(TYPE_BUILDING_ID id);
 void BuildingDraw(TYPE_CAMERA * ptrCamera, TYPE_BUILDING * ptrBuilding, bool bSelected);
 void BuildingSelectedOptions(TYPE_BUILDING * ptrBuilding);
  

GameStructures.h

@@ -6,6 +6,10 @@ extern "C" {
 #endif //__cplusplus
 
 /* *************************************
+ * 	Includes
+ * *************************************/
+ 
+ /* *************************************
  * 	Defines
  * *************************************/
 
@@ -22,12 +26,18 @@ typedef struct t_Camera
 	uint8_t Speed_Timer;
 }TYPE_CAMERA;
 
+typedef enum t_buildingIds
+{
+	BARRACKS 	= 0	,
+	TOWER			,
+}TYPE_BUILDING_ID;
+
 typedef struct t_Building
 {
 	uint16_t x;
 	uint16_t y;
 	uint8_t hp;
-	uint8_t id;
+	TYPE_BUILDING_ID id;
 	bool built;
 	bool selected;
 }TYPE_BUILDING;

Player.h

@@ -39,7 +39,7 @@ class Player
 		void	setHuman(bool value) { human = value; }
 		bool	isHuman(void) {return human;}
 		bool	createUnit(uint8_t id, TYPE_COLLISION_BLOCK cb);
-		bool	createBuilding(uint8_t id, TYPE_COLLISION_BLOCK cb);
+		bool	createBuilding(TYPE_BUILDING_ID id, TYPE_COLLISION_BLOCK cb);
 		uint8_t	getPopulation(void) {return (unit_i + 1);}
 		uint8_t	getBuildings(void) {return (bldg_i + 1);}
 	

Unit.h

@@ -23,10 +23,10 @@ extern "C"
  * 	Structs and enums					*
  * **************************************/
  
-enum
+typedef enum t_unitid
 {
 	PEASANT 	= 0
-};
+}TYPE_UNIT_ID;
  
 /* **************************************
  * 	Global prototypes					*