From c0bcfca33472919caa150022f826f0d658d95df9 Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 17 Mar 2018 17:33:09 +0000 Subject: [PATCH] Tidied headers. --- src/game/credits.h | 2 -- src/test/worldTest.h | 2 -- src/world/entities.h | 3 +-- src/world/items.h | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/game/credits.h b/src/game/credits.h index 276f8fc..f3ca074 100644 --- a/src/game/credits.h +++ b/src/game/credits.h @@ -22,9 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CREDIT_LINE_LIMIT 500 -extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); -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 c, const char *format, ...); extern void endSectionTransition(void); extern Atlas *getImageFromAtlas(char *filename); diff --git a/src/test/worldTest.h b/src/test/worldTest.h index 73c6dd2..d84eff6 100644 --- a/src/test/worldTest.h +++ b/src/test/worldTest.h @@ -22,11 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern void createScreenshotFolder(void); extern void initHub(void); -extern void initOptions(void); extern void initWorld(void); extern void loadGame(void); extern void saveGame(void); -extern Dev dev; extern Game game; diff --git a/src/world/entities.h b/src/world/entities.h index 10ddab3..0fab5e3 100644 --- a/src/world/entities.h +++ b/src/world/entities.h @@ -35,14 +35,13 @@ extern Texture *getTexture(const char *filename); extern int isLiquid(int x, int y); extern int isSolid(int x, int y); extern int isWalkable(int x, int y); +extern int isWithinMap(int x, int y); extern float limit(float i, float a, float b); extern void playBattleSound(int snd, int ch, int x, int y); extern void removeFromQuadtree(Entity *e, Quadtree *root); extern void terminateJetpack(void); -extern int isWithinMap(int x, int y); extern Camera camera; -extern Dev dev; extern Entity *self; extern World world; diff --git a/src/world/items.h b/src/world/items.h index 5feec8c..2eaeeaa 100644 --- a/src/world/items.h +++ b/src/world/items.h @@ -21,12 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" extern Item * initWeaponPickup(void); +extern int getPercent(float current, float total); extern int getRandomPlayerWeapon(int excludeGrenades); extern Sprite *getSprite(char *name); extern Item *initBattery(void); extern Item *initCherry(void); extern int rrnd(int low, int high); -extern int getPercent(float current, float total); extern World world;