From 1244505327009142c80140e44c86138f4fd6ae07 Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Tue, 6 Jun 2017 06:52:46 +0200 Subject: * Implemented aircraft collision. But it would not detect collision in some cases. * Remove unneeded whitespace character on pointer variables (unary operators should not have any whitespaces). * SelectedAircraft index now increases or decreases automatically on aircraft added/removed. * Started writing Plt generation routines. Still a lot of work TODO. --- Source/System.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'Source/System.c') diff --git a/Source/System.c b/Source/System.c index 48533c1..6645682 100644 --- a/Source/System.c +++ b/Source/System.c @@ -346,7 +346,7 @@ void SystemCheckTimer(bool* timer, uint64_t* last_timer, uint8_t step) /* **************************************************************************************** * - * @name bool SystemLoadFileToBuffer(char * fname, uint8_t* buffer, uint32_t szBuffer) + * @name bool SystemLoadFileToBuffer(char* fname, uint8_t* buffer, uint32_t szBuffer) * * @author: Xavier Del Campo * @@ -357,7 +357,7 @@ void SystemCheckTimer(bool* timer, uint64_t* last_timer, uint8_t step) * * ****************************************************************************************/ -bool SystemLoadFileToBuffer(char * fname, uint8_t* buffer, uint32_t szBuffer) +bool SystemLoadFileToBuffer(char* fname, uint8_t* buffer, uint32_t szBuffer) { FILE *f; int32_t size; @@ -414,7 +414,7 @@ bool SystemLoadFileToBuffer(char * fname, uint8_t* buffer, uint32_t szBuffer) /* **************************************************************************************** * - * @name bool SystemLoadFile(char *fname) + * @name bool SystemLoadFile(char*fname) * * @author: Xavier Del Campo * @@ -424,7 +424,7 @@ bool SystemLoadFileToBuffer(char * fname, uint8_t* buffer, uint32_t szBuffer) * * ****************************************************************************************/ -bool SystemLoadFile(char *fname) +bool SystemLoadFile(char*fname) { return SystemLoadFileToBuffer(fname,file_buffer,sizeof(file_buffer)); } @@ -444,6 +444,21 @@ uint8_t* SystemGetBufferAddress(void) return file_buffer; } +/* ****************************************************************** + * + * @name void SystemClearBuffer(void) + * + * @author: Xavier Del Campo + * + * @return: Fills internal buffer with zeros + * + * *****************************************************************/ + +void SystemClearBuffer(void) +{ + memset(file_buffer, 0, sizeof(file_buffer)); +} + /* ****************************************************************** * * @name void SystemWaitCycles(uint32_t cycles) @@ -788,7 +803,7 @@ void SystemSetStackPattern(void) *ptrStack = END_STACK_PATTERN; } -int32_t SystemIndexOfStringArray(char * str, char ** array) +int32_t SystemIndexOfStringArray(char* str, char** array) { int32_t i; -- cgit v1.2.3