From 9c1b39179d294eaf22be3d59f34a4958a0794c26 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Wed, 25 Apr 2018 07:56:06 +0100
Subject: [PATCH] Tidied up headers.

---
 src/combat/explosions.h | 2 +-
 src/game/game.h         | 2 +-
 src/game/title.h        | 2 +-
 src/hub/postMission.h   | 4 ++--
 src/system/draw.h       | 2 +-
 src/system/init.h       | 2 +-
 src/world/worldLoader.h | 2 +-
 src/world/worldSaver.h  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/combat/explosions.h b/src/combat/explosions.h
index d917b3a..0d8e9d4 100644
--- a/src/combat/explosions.h
+++ b/src/combat/explosions.h
@@ -26,8 +26,8 @@ extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
 extern int getDistance(int x1, int y1, int x2, int y2);
 extern void playBattleSound(int snd, int ch, int x, int y);
 extern int rrnd(int low, int high);
+extern void setGameplayMessage(int newMessageType, const char *format, ...);
 extern void stunBob(void);
 extern void swapSelf(Entity *e);
-extern void setGameplayMessage(int newMessageType, const char *format, ...);
 
 extern Game game;
diff --git a/src/game/game.h b/src/game/game.h
index c3ea080..45006d8 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../common.h"
 #include "../json/cJSON.h"
 
+extern char *buildFormattedString(const char *format, ...);
 extern Entity *createEntity(char *name);
 extern int deleteFile(char *path);
 extern int fileExists(const char *filename);
@@ -33,7 +34,6 @@ extern int lookup(char *name);
 extern char *readFile(const char *filename);
 extern char *timeToString(int seconds, int showHours);
 extern int writeFile(const char *filename, const char *data);
-extern char *buildFormattedString(const char *format, ...);
 
 extern App app;
 extern Entity *self;
diff --git a/src/game/title.h b/src/game/title.h
index 54dee3e..03f3228 100644
--- a/src/game/title.h
+++ b/src/game/title.h
@@ -29,6 +29,7 @@ enum
 };
 
 extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center);
+extern char *buildFormattedString(const char *format, ...);
 extern void deleteSaveSlot(int slot);
 extern void destroyGame(void);
 extern void doWidgets(void);
@@ -54,7 +55,6 @@ extern void setSelectedWidget(char *name, char *group);
 extern void showWidgetGroup(char *group);
 extern void startSectionTransition(void);
 extern void stopMusic(void);
-extern char *buildFormattedString(const char *format, ...);
 
 extern App app;
 extern Colors colors;
diff --git a/src/hub/postMission.h b/src/hub/postMission.h
index 0303399..997c779 100644
--- a/src/hub/postMission.h
+++ b/src/hub/postMission.h
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../common.h"
 
 extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center);
+extern char *buildFormattedString(const char *format, ...);
 extern void clearControls(void);
 extern void destroyWorld(void);
 extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
@@ -33,12 +34,11 @@ extern void initWorld(void);
 extern int isAcceptControl(void);
 extern float limit(float i, float low, float high);
 extern void playSound(int snd, int ch);
+extern int renameFile(char *src, char *dest);
 extern void restoreGameState(void);
 extern void saveGame(int isTempFile);
 extern void saveWorld(void);
 extern void startSectionTransition(void);
-extern char *buildFormattedString(const char *format, ...);
-extern int renameFile(char *src, char *dest);
 
 extern App app;
 extern Colors colors;
diff --git a/src/system/draw.h b/src/system/draw.h
index 4993823..042e807 100644
--- a/src/system/draw.h
+++ b/src/system/draw.h
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../common.h"
 #include "savepng.h"
 
-extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
 extern char *buildFormattedString(const char *format, ...);
+extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...);
 
 extern App app;
 extern Colors colors;
diff --git a/src/system/init.h b/src/system/init.h
index 6b2ff24..c9c88da 100644
--- a/src/system/init.h
+++ b/src/system/init.h
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "locale.h"
 
+extern char *buildFormattedString(const char *format, ...);
 extern void createSaveFolder(void);
 extern void destroyFonts(void);
 extern void destroyGame(void);
@@ -54,6 +55,5 @@ extern void presentScene(void);
 extern char *readFile(const char *filename);
 extern void setLanguage(char *applicationName, char *languageCode);
 extern int writeFile(const char *filename, const char *data);
-extern char *buildFormattedString(const char *format, ...);
 
 extern App app;
diff --git a/src/world/worldLoader.h b/src/world/worldLoader.h
index aca76b5..d716095 100644
--- a/src/world/worldLoader.h
+++ b/src/world/worldLoader.h
@@ -21,10 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../common.h"
 #include "../json/cJSON.h"
 
+extern char *buildFormattedString(const char *format, ...);
 extern Entity *createEntity(char *typeStr);
 extern int fileExists(const char *filename);
 extern char *readFile(const char *filename);
-extern char *buildFormattedString(const char *format, ...);
 
 extern App app;
 extern Dev dev;
diff --git a/src/world/worldSaver.h b/src/world/worldSaver.h
index 65531e9..52d51b6 100644
--- a/src/world/worldSaver.h
+++ b/src/world/worldSaver.h
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../common.h"
 #include "../json/cJSON.h"
 
-extern int writeFile(const char *filename, const char *data);
 extern char *buildFormattedString(const char *format, ...);
+extern int writeFile(const char *filename, const char *data);
 
 extern App app;
 extern Entity *self;