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

1 files changed, 40 insertions, 40 deletions

diff --git a/System.c b/System.c
index 09e086a..8535eb9 100644
--- a/System.c
+++ b/System.c
@@ -15,7 +15,7 @@
 /* *************************************
  * 	Local Prototypes
  * *************************************/
- 
+
 //static void SystemCheckTimer(bool * timer, uint64_t * last_timer, uint8_t step);
 
 /* *************************************
@@ -51,7 +51,7 @@ void SystemInit(void)
 	SystemResetTimers();
 	//Initial value for system_busy
 	system_busy = false;
-	
+
 	#if defined(USBCON)
 	USBDevice.attach();
 	#endif
@@ -59,7 +59,7 @@ void SystemInit(void)
 
 void SystemSetRandSeed(void)
 {
-	if(rand_seed == false)
+	if (rand_seed == false)
 	{
 		rand_seed = true;
 		//Set random seed using global timer as reference
@@ -96,7 +96,7 @@ void SystemRunTimers(void)
 {
 /*	static uint64_t last_one_second_tick;
 	static uint64_t last_100_ms_tick;
-	
+
 	SystemCheckTimer(&one_second_timer, &last_one_second_tick, REFRESH_FREQUENCY);
 	SystemCheckTimer(&hundred_ms_timer, &last_100_ms_tick, 2);
 	* */
@@ -104,23 +104,23 @@ void SystemRunTimers(void)
 
 void SystemCheckTimer(bool * timer, uint64_t * last_timer, uint8_t step)
 {
-	if(*timer == true)
+	if (*timer == true)
 	{
 		*timer = false;
 		*last_timer = global_timer;
 	}
 
-	if(global_timer >= (*last_timer + step) )
+	if (global_timer >= (*last_timer + step) )
 	{
 		*timer = true;
-	}	
+	}
 }
 
 void SystemWaitCycles(uint32_t cycles)
 {
 	uint64_t currentTime = global_timer;
-	
-	while(global_timer < (currentTime + cycles) );
+
+	while (global_timer < (currentTime + cycles) );
 }
 
 uint32_t SystemRand(uint32_t min, uint32_t max)
@@ -133,33 +133,33 @@ bool SystemIsBusy(void)
 	return system_busy;
 }
 
-bool SystemContains_u8(uint8_t value, uint8_t * buffer, size_t sz)
+bool SystemContains_u8(uint8_t value, uint8_t* buffer, size_t sz)
 {
 	size_t i = 0;
-	
-	for(i = 0; i < sz; i++)
+
+	for (i = 0; i < sz; i++)
 	{
-		if(buffer[i] == value)
+		if (buffer[i] == value)
 		{
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
 bool SystemContains_u16(uint16_t value, uint16_t * buffer, size_t sz)
 {
 	size_t i = 0;
-	
-	for(i = 0; i < sz; i++)
+
+	for (i = 0; i < sz; i++)
 	{
-		if(buffer[i] == value)
+		if (buffer[i] == value)
 		{
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
@@ -167,15 +167,15 @@ TYPE_TIMER * SystemCreateTimer(uint32_t seconds, bool rf, void (*timer_callback)
 {
 	bool success = false;
 	uint8_t i;
-	
-	if(seconds == 0)
+
+	if (seconds == 0)
 	{
 		return NULL;
 	}
-	
-	for(i = 0; i < SYSTEM_MAX_TIMERS; i++)
+
+	for (i = 0; i < SYSTEM_MAX_TIMERS; i++)
 	{
-		if(timer_array[i].busy == false)
+		if (timer_array[i].busy == false)
 		{
 			timer_array[i].Timeout_Callback = timer_callback;
 			timer_array[i].time = seconds;
@@ -186,20 +186,20 @@ TYPE_TIMER * SystemCreateTimer(uint32_t seconds, bool rf, void (*timer_callback)
 			break;
 		}
 	}
-	
-	if(success == false)
+
+	if (success == false)
 	{
 		return NULL;
 	}
-	
+
 	return &timer_array[i];
 }
 
 void SystemResetTimers(void)
 {
 	uint8_t i;
-	
-	for(i = 0; i < SYSTEM_MAX_TIMERS; i++)
+
+	for (i = 0; i < SYSTEM_MAX_TIMERS; i++)
 	{
 		timer_array[i].Timeout_Callback = NULL;
 		timer_array[i].busy = false;
@@ -212,20 +212,20 @@ void SystemResetTimers(void)
 void SystemUserTimersHandler(void)
 {
 	uint8_t i;
-	
-	for(i = 0; i < SYSTEM_MAX_TIMERS; i++)
+
+	for (i = 0; i < SYSTEM_MAX_TIMERS; i++)
 	{
-		if(timer_array[i].busy == true)
+		if (timer_array[i].busy == true)
 		{
-			if(System1SecondTick() == true)
+			if (System1SecondTick() == true)
 			{
 				timer_array[i].time--;
-				
-				if(timer_array[i].time == 0)
+
+				if (timer_array[i].time == 0)
 				{
 					timer_array[i].Timeout_Callback();
-					
-					if(timer_array[i].repeat_flag == true)
+
+					if (timer_array[i].repeat_flag == true)
 					{
 						timer_array[i].time = timer_array[i].orig_time;
 					}
@@ -259,15 +259,15 @@ void SystemTimerRemove(TYPE_TIMER * timer)
 bool SystemArrayCompare(unsigned short * arr1, unsigned short * arr2, size_t sz)
 {
 	size_t i;
-	
-	for(i = 0; i < sz; i++)
+
+	for (i = 0; i < sz; i++)
 	{
-		if(arr1[i] != arr2[i])
+		if (arr1[i] != arr2[i])
 		{
 			return false;
 		}
 	}
-	
+
 	return true;
 }