From f3956d370d416931c1af0ddc10b8451810d6a481 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Thu, 12 May 2016 12:20:16 +0100
Subject: [PATCH] Tidy headers update.

---
 src/battle/capitalShips.h | 1 -
 src/battle/fighters.h     | 1 -
 src/main.h                | 1 -
 src/system/init.h         | 1 -
 tools/tidyHeaders.sh      | 6 +++---
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/battle/capitalShips.h b/src/battle/capitalShips.h
index ec2b596..2f232e6 100644
--- a/src/battle/capitalShips.h
+++ b/src/battle/capitalShips.h
@@ -34,7 +34,6 @@ extern char *readFile(char *filename);
 extern long flagsToLong(char *flags, int *add);
 extern long lookup(char *name);
 extern void doAI(void);
-extern float mod(float n, float x);
 extern void applyFighterThrust(void);
 extern void addLargeEngineEffect(void);
 extern int getDistance(int x1, int y1, int x2, int y2);
diff --git a/src/battle/fighters.h b/src/battle/fighters.h
index c4f5e6c..31e328d 100644
--- a/src/battle/fighters.h
+++ b/src/battle/fighters.h
@@ -52,7 +52,6 @@ extern char *getJSONValueStr(cJSON *node, char *name, char *defValue);
 extern void awardTrophy(char *id);
 extern void addRandomItem(int x, int y);
 
-extern App app;
 extern Battle battle;
 extern Colors colors;
 extern Entity *player;
diff --git a/src/main.h b/src/main.h
index 5915858..727f219 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,7 +45,6 @@ extern int fileExists(char *filename);
 extern char *getSaveFilePath(char *filename);
 extern void init18N(int argc, char *argv[]);
 extern void initLookups(void);
-extern void initGame(void);
 extern void doKeyDown(SDL_KeyboardEvent *event);
 extern void doKeyUp(SDL_KeyboardEvent *event);
 extern void createScreenshotFolder(void);
diff --git a/src/system/init.h b/src/system/init.h
index 97f9767..baf6729 100644
--- a/src/system/init.h
+++ b/src/system/init.h
@@ -74,4 +74,3 @@ extern void initTrophies(void);
 
 extern App app;
 extern Colors colors;
-extern Game game;
diff --git a/tools/tidyHeaders.sh b/tools/tidyHeaders.sh
index 76c9d52..9d2dc53 100755
--- a/tools/tidyHeaders.sh
+++ b/tools/tidyHeaders.sh
@@ -53,8 +53,8 @@ function cleanHeader($headerFile)
 				if (count($matches) == 3)
 				{
 					$extern = $matches[2];
-				
-					if (strstr($body, $extern) === FALSE)
+					
+					if (!preg_match_all("/\b[(]?${extern}[\\(;,)\\n]/", $body))
 					{
 						if (!$hasChanges)
 						{
@@ -89,7 +89,7 @@ function cleanHeader($headerFile)
 					
 					$externs[] = $extern;
 					
-					if (strstr($body, "$extern") === FALSE)
+					if (!preg_match_all("/\b${extern}[\\.\\-\\)]/", $body))
 					{
 						if (!$hasChanges)
 						{