Tidy headers.

src/entities/finalToilet.h

@@ -22,6 +22,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../json/cJSON.h"
 
 extern AtlasImage *getAtlasImage(char *filename, int required);
-extern void initEnding(void);
 
 extern Stage stage;

src/game/credits.h

@@ -20,9 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../common.h"
 
-extern void doEntities(void);
-extern char *readFile(const char *filename);
 extern const char *getFileLocation(const char *filename);
+extern void doEntities(void);
 extern void drawText(int x, int y, int size, int align, SDL_Color color, const char *format, ...);
+extern char *readFile(const char *filename);
 
 extern App app;

src/game/ending.h

@@ -20,19 +20,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../common.h"
 
+extern void destroyStage(void);
 extern void doEntities(void);
 extern int doWipe(void);
 extern void drawEntities(int background);
-extern AtlasImage *getAtlasImage(char *filename, int required);
 extern void drawMap(void);
 extern void drawText(int x, int y, int size, int align, SDL_Color color, const char *format, ...);
 extern void drawWipe(void);
-extern void initWipe(int type);
-extern void loadStage(int randomTiles);
-extern void blitAtlasImage(AtlasImage *atlasImage, int x, int y, int center, SDL_RendererFlip flip);
-extern void destroyStage(void);
+extern AtlasImage *getAtlasImage(char *filename, int required);
 extern void initCredits(void (*done)(void));
 extern void initTitle(void);
+extern void initWipe(int type);
+extern void loadStage(int randomTiles);
 
 extern App app;
 extern Stage stage;

src/game/game.h

@@ -21,14 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../common.h"
 #include "../json/cJSON.h"
 
+extern const char *getFileLocation(const char *filename);
 extern int fileExists(const char *filename);
+extern int getJSONIntVal(cJSON *root, char *name, int defaultValue);
 extern char *getLookupName(char *prefix, long num);
 extern StageMeta *getStageMeta(int n);
 extern unsigned long lookup(const char *name);
 extern char *readFile(const char *filename);
 extern int writeFile(const char *filename, const char *data);
-extern int getJSONIntVal(cJSON *root, char *name, int defaultValue);
-extern const char *getFileLocation(const char *filename);
 
 extern App app;
 extern Game game;

src/game/meta.h

@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../common.h"
 #include "../json/cJSON.h"
 
-extern const char *getFileLocation(const char *filename);
 extern int fileExists(const char *filename);
 extern char *readFile(const char *filename);
 

src/game/stageSelect.h

@@ -31,11 +31,11 @@ extern void drawText(int x, int y, int size, int align, SDL_Color color, const c
 extern AtlasImage *getAtlasImage(char *filename, int required);
 extern void initStage(void);
 extern int isAcceptControl(void);
+extern int isControl(int type);
 extern void loadRandomStageMusic(void);
 extern void loadStage(int randomTiles);
 extern void playSound(int snd, int ch);
 extern void showWidgets(const char *groupName, int visible);
-extern int isControl(int type);
 
 extern App app;
 extern Game game;

src/game/stats.h

@@ -28,12 +28,12 @@ extern void doWidgets(const char *groupName);
 extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern void drawText(int x, int y, int size, int align, SDL_Color color, const char *format, ...);
+extern void drawWidgetFrame(void);
 extern void drawWidgets(const char *groupName);
 extern AtlasImage *getAtlasImage(char *filename, int required);
 extern Widget *getWidget(const char *name, const char *groupName);
-extern void showWidgets(const char *groupName, int visible);
-extern void drawWidgetFrame(void);
 extern int isControl(int type);
+extern void showWidgets(const char *groupName, int visible);
 
 extern App app;
 extern Game game;

src/game/title.h

@@ -26,7 +26,6 @@ extern void doEntities(void);
 extern void doWidgets(const char *groupName);
 extern int doWipe(void);
 extern void drawEntities(int background);
-extern void initCredits(void (*done)(void));
 extern void drawMap(void);
 extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern void drawText(int x, int y, int size, int align, SDL_Color color, const char *format, ...);
@@ -35,6 +34,7 @@ extern void drawWidgets(const char *groupName);
 extern void drawWipe(void);
 extern AtlasImage *getAtlasImage(char *filename, int required);
 extern Widget *getWidget(const char *name, const char *groupName);
+extern void initCredits(void (*done)(void));
 extern void initOptions(void (*done)(void));
 extern void initStageSelect(void (*done)(void));
 extern void initStats(void (*done)(void));

src/system/init.h

@@ -27,6 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../common.h"
 
 extern void createSaveFolder(void);
+extern void destroySounds(void);
+extern void destroyTextures(void);
 extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern void initAtlas(void);
 extern void initEntityFactory(void);
@@ -40,7 +42,5 @@ extern void initWidgets(void);
 extern void loadConfig(void);
 extern void prepareScene(void);
 extern void presentScene(void);
-extern void destroyTextures(void);
-extern void destroySounds(void);
 
 extern App app;

src/system/sound.h

@@ -22,6 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../common.h"
 
+extern const char *getFileLocation(const char *filename);
 extern float getAngle(int x1, int y1, int x2, int y2);
 extern int getDistance(int x1, int y1, int x2, int y2);
-extern const char *getFileLocation(const char *filename);

src/system/textures.h

@@ -22,6 +22,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../common.h"
 
-extern const char *getFileLocation(char *filename);
-
 extern App app;

src/system/widgets.h

@@ -23,16 +23,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern void calcTextDimensions(const char *text, int size, int *w, int *h);
 extern const char *getFileLocation(const char *filename);
+extern void clearAcceptControls(void);
+extern void clearControl(int type);
 extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern void drawText(int x, int y, int size, int align, SDL_Color color, const char *format, ...);
 extern char **getFileList(const char *dir, int *count);
+extern int isAcceptControl(void);
+extern int isControl(int type);
 extern long lookup(const char *name);
 extern void playSound(int snd, int ch);
 extern char *readFile(const char *filename);
-extern int isControl(int type);
-extern void clearControl(int type);
-extern int isAcceptControl(void);
-extern void clearAcceptControls(void);
 
 extern App app;

src/world/entityFactory.h

@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../json/cJSON.h"
 
 extern void initCoin(Entity *e);
+extern void initDecoration(Entity *e);
 extern void initDoor(Entity *e);
 extern void initFinalToilet(Entity *e);
 extern void initItem(Entity *e);
@@ -41,7 +42,6 @@ extern void initTrafficLight(Entity *e);
 extern void initVomitToilet(Entity *e);
 extern void initWaterButton(Entity *e);
 extern void initWaterPistol(Entity *e);
-extern void initDecoration(Entity *e);
 
 extern Entity *self;
 extern Stage stage;