From 7f705a664170bec90cde946ca604fd7a51fce04f Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 21 Mar 2018 08:44:30 +0000 Subject: [PATCH] Tidy. --- src/entities/blobs/bob.h | 4 ++-- src/entities/evilBlobs/evilBlob.h | 2 +- src/game/credits.h | 5 ++--- src/game/ending.h | 2 +- src/hub/postMission.h | 3 +-- src/world/world.h | 1 - 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/entities/blobs/bob.h b/src/entities/blobs/bob.h index f92e4c2..e13abfc 100644 --- a/src/entities/blobs/bob.h +++ b/src/entities/blobs/bob.h @@ -26,7 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SWIM_SPEED 3 #define WALK_SPEED 5 +extern void addBloodDecal(int x, int y); extern void addFlameParticles(float x, float y, int rising); +extern void addPopParticles(float x, float y); extern void addTeleportStars(Entity *e); extern void clearControl(int type); extern void fireGrenade(Entity *e); @@ -46,8 +48,6 @@ extern double randF(void); extern int rrnd(int low, int high); extern void setGameplayMessage(int type, char *format, ...); extern void throwFleshChunks(float x, float y, int amount); -extern void addPopParticles(float x, float y); -extern void addBloodDecal(int x, int y); extern App app; extern Dev dev; diff --git a/src/entities/evilBlobs/evilBlob.h b/src/entities/evilBlobs/evilBlob.h index 9f8aeb1..73d9644 100644 --- a/src/entities/evilBlobs/evilBlob.h +++ b/src/entities/evilBlobs/evilBlob.h @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" extern void addBloodDecal(int x, int y); +extern void addPopParticles(float x, float y); extern void addRandomItems(int x, int y); extern void addRandomWeapon(int x, int y); extern Unit *createUnit(void); @@ -34,7 +35,6 @@ extern double randF(void); extern int rrnd(int low, int high); extern void throwFleshChunks(float x, float y, int amount); extern void updateObjective(char *targetName); -extern void addPopParticles(float x, float y); extern App app; extern Dev dev; diff --git a/src/game/credits.h b/src/game/credits.h index 57b592f..4d03361 100644 --- a/src/game/credits.h +++ b/src/game/credits.h @@ -28,14 +28,13 @@ extern void endSectionTransition(void); extern Atlas *getImageFromAtlas(char *filename); extern Texture *getTexture(const char *filename); extern int getWrappedTextHeight(const char *text, int size); +extern void initTitle(void); extern void limitTextWidth(int width); extern void loadMusic(char *filename); extern void playMusic(int loop); extern char *readFile(const char *filename); -extern void startSectionTransition(void); -extern void stopMusic(void); extern void returnToTitle(void); -extern void initTitle(void); +extern void startSectionTransition(void); extern App app; extern Colors colors; diff --git a/src/game/ending.h b/src/game/ending.h index bb6ce1b..98e897c 100644 --- a/src/game/ending.h +++ b/src/game/ending.h @@ -29,10 +29,10 @@ extern void endSectionTransition(void); extern Atlas *getImageFromAtlas(char *filename); extern Texture *getTexture(const char *filename); extern int getWrappedTextHeight(const char *text, int size); +extern void initCredits(int playMusic); extern void limitTextWidth(int width); extern char *readFile(const char *filename); extern void startSectionTransition(void); -extern void initCredits(int playMusic); extern App app; extern Colors colors; diff --git a/src/hub/postMission.h b/src/hub/postMission.h index 98c317a..35898c2 100644 --- a/src/hub/postMission.h +++ b/src/hub/postMission.h @@ -27,8 +27,8 @@ extern void drawText(int x, int y, int size, int align, SDL_Color c, const char extern void endSectionTransition(void); extern Atlas *getImageFromAtlas(char *filename); extern Texture *getTexture(const char *filename); +extern void initEnding(void); extern void initHub(void); -extern void initTitle(void); extern void initWorld(void); extern int isAcceptControl(void); extern float limit(float i, float low, float high); @@ -37,7 +37,6 @@ extern void restoreGameState(void); extern void saveGame(void); extern void saveWorld(void); extern void startSectionTransition(void); -extern void initEnding(void); extern App app; extern Colors colors; diff --git a/src/world/world.h b/src/world/world.h index 2b58423..dc99c87 100644 --- a/src/world/world.h +++ b/src/world/world.h @@ -81,7 +81,6 @@ extern Texture *getTexture(const char *filename); extern Widget *getWidget(char *name, char *group); extern void hideAllWidgets(void); extern void initEffects(void); -extern void initEnding(void); extern void initEntities(void); extern void initHud(void); extern void initItems(void);