From 6b246971b30467e17675f7111e23a99ce2c937d7 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Tue, 27 Feb 2018 22:35:31 +0000
Subject: [PATCH] Tidied headers.

---
 src/entities/boss/blobBoss.h            | 1 -
 src/entities/boss/eyeDroidCommander.h   | 1 -
 src/entities/boss/tankCommander.h       | 1 -
 src/entities/bullets/bullet.h           | 1 -
 src/entities/bullets/grenade.h          | 1 -
 src/entities/bullets/laser.h            | 1 -
 src/entities/evilBlobs/evilBlob.h       | 1 -
 src/entities/eyeDroids/eyeDroid.h       | 1 -
 src/entities/structures/pressurePlate.h | 1 -
 src/entities/structures/pushBlock.h     | 1 -
 src/entities/structures/teleporter.h    | 1 -
 src/entities/traps/laserTrap.h          | 1 -
 src/entities/unit.h                     | 1 -
 src/hub/postMission.h                   | 1 -
 src/test/atlasTest.h                    | 1 -
 src/world/entities.h                    | 1 -
 src/world/player.h                      | 1 -
 src/world/world.h                       | 1 -
 18 files changed, 18 deletions(-)

diff --git a/src/entities/boss/blobBoss.h b/src/entities/boss/blobBoss.h
index dc38eba..e263d95 100644
--- a/src/entities/boss/blobBoss.h
+++ b/src/entities/boss/blobBoss.h
@@ -27,7 +27,6 @@ extern void playMusic(int loop);
 extern int isPlayingMusic(void);
 extern float limit(float i, float a, float b);
 extern double randF(void);
-extern void playSound(int snd, int ch);
 extern void playBattleSound(int snd, int ch, int x, int y);
 extern Bullet *createBaseBullet(Unit *owner);
 extern Sprite *getSprite(char *name);
diff --git a/src/entities/boss/eyeDroidCommander.h b/src/entities/boss/eyeDroidCommander.h
index d1702bf..85b654a 100644
--- a/src/entities/boss/eyeDroidCommander.h
+++ b/src/entities/boss/eyeDroidCommander.h
@@ -31,7 +31,6 @@ extern int getDistance(int x1, int y1, int x2, int y2);
 extern int enemyCanSeePlayer(Entity *e);
 extern void updateObjective(char *targetName);
 extern double randF(void);
-extern void playSound(int snd, int ch);
 extern Bullet *createBaseBullet(Unit *owner);
 extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy);
 extern void addExplosion(float x, float y, int radius, Entity *owner);
diff --git a/src/entities/boss/tankCommander.h b/src/entities/boss/tankCommander.h
index 60a4ed2..885f88f 100644
--- a/src/entities/boss/tankCommander.h
+++ b/src/entities/boss/tankCommander.h
@@ -29,7 +29,6 @@ extern int rrnd(int low, int high);
 extern int getDistance(int x1, int y1, int x2, int y2);
 extern int enemyCanSeePlayer(Entity *e);
 extern void updateObjective(char *targetName);
-extern void playSound(int snd, int ch);
 extern Bullet *createBaseBullet(Unit *owner);
 extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy);
 extern void addExplosion(float x, float y, int radius, Entity *owner);
diff --git a/src/entities/bullets/bullet.h b/src/entities/bullets/bullet.h
index 7ecd54e..20e838d 100644
--- a/src/entities/bullets/bullet.h
+++ b/src/entities/bullets/bullet.h
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../../common.h"
 
-extern void playSound(int snd, int ch);
 extern void initEntity(Entity *e);
 extern void addSmallFleshChunk(float x, float y);
 extern void addSparkParticles(float x, float y);
diff --git a/src/entities/bullets/grenade.h b/src/entities/bullets/grenade.h
index 5b5ddf0..4bcacc8 100644
--- a/src/entities/bullets/grenade.h
+++ b/src/entities/bullets/grenade.h
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../../common.h"
 
-extern void playSound(int snd, int ch);
 extern void initGrenade(Bullet *b);
 extern void addSmallFleshChunk(float x, float y);
 extern void addSparkParticles(float x, float y);
diff --git a/src/entities/bullets/laser.h b/src/entities/bullets/laser.h
index ed93cf9..ee9bc78 100644
--- a/src/entities/bullets/laser.h
+++ b/src/entities/bullets/laser.h
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../../common.h"
 
-extern void playSound(int snd, int ch);
 extern int rrnd(int low, int high);
 extern void initLaser(Bullet *b);
 extern void addSmallFleshChunk(float x, float y);
diff --git a/src/entities/evilBlobs/evilBlob.h b/src/entities/evilBlobs/evilBlob.h
index d7bbdff..66ac95e 100644
--- a/src/entities/evilBlobs/evilBlob.h
+++ b/src/entities/evilBlobs/evilBlob.h
@@ -26,7 +26,6 @@ extern double randF(void);
 extern void throwFleshChunks(float x, float y, int amount);
 extern void addRandomWeapon(int x, int y);
 extern float limit(float i, float a, float b);
-extern void playSound(int snd, int ch);
 extern void addBloodDecal(int x, int y);
 extern void updateObjective(char *targetName);
 extern int enemyCanSeePlayer(Entity *e);
diff --git a/src/entities/eyeDroids/eyeDroid.h b/src/entities/eyeDroids/eyeDroid.h
index 5cf0679..fb4a0c1 100644
--- a/src/entities/eyeDroids/eyeDroid.h
+++ b/src/entities/eyeDroids/eyeDroid.h
@@ -25,7 +25,6 @@ extern int getDistance(int x1, int y1, int x2, int y2);
 extern double randF(void);
 extern void addRandomWeapon(int x, int y);
 extern float limit(float i, float a, float b);
-extern void playSound(int snd, int ch);
 extern void updateObjective(char *targetName);
 extern int enemyCanSeePlayer(Entity *e);
 extern void fireTriggers(char *name);
diff --git a/src/entities/structures/pressurePlate.h b/src/entities/structures/pressurePlate.h
index c2858f6..dc4a13e 100644
--- a/src/entities/structures/pressurePlate.h
+++ b/src/entities/structures/pressurePlate.h
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern Structure *createStructure(void);
 extern Sprite *getSprite(char *name);
 extern void activateEntities(char *names, int activate);
-extern void playSound(int snd, int ch);
 extern void playBattleSound(int snd, int ch, int x, int y);
 
 extern Entity *self;
diff --git a/src/entities/structures/pushBlock.h b/src/entities/structures/pushBlock.h
index 5c86748..b72e57a 100644
--- a/src/entities/structures/pushBlock.h
+++ b/src/entities/structures/pushBlock.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 void playSound(int snd, int ch);
 extern void addTeleportStars(Entity *e);
 extern Structure *createStructure(void);
 extern Sprite *getSprite(char *name);
diff --git a/src/entities/structures/teleporter.h b/src/entities/structures/teleporter.h
index 36f7cda..ab0ffc3 100644
--- a/src/entities/structures/teleporter.h
+++ b/src/entities/structures/teleporter.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 void playSound(int snd, int ch);
 extern void addTeleporterEffect(float x, float y);
 extern void teleportEntity(Entity *e, float tx, float ty);
 extern void observeActivation(Entity *e);
diff --git a/src/entities/traps/laserTrap.h b/src/entities/traps/laserTrap.h
index 94e74ed..ea9d24d 100644
--- a/src/entities/traps/laserTrap.h
+++ b/src/entities/traps/laserTrap.h
@@ -31,7 +31,6 @@ extern void stunBob(void);
 extern void addSparkParticles(float x, float y);
 extern void addSmallFleshChunk(float x, float y);
 extern void swapSelf(Entity *e);
-extern void playSound(int snd, int ch);
 extern void playBattleSound(int snd, int ch, int x, int y);
 
 extern Entity *self;
diff --git a/src/entities/unit.h b/src/entities/unit.h
index 43b925e..36cb028 100644
--- a/src/entities/unit.h
+++ b/src/entities/unit.h
@@ -34,7 +34,6 @@ extern void fireLaser(Entity *e);
 extern void fireShotgun(Entity *e);
 extern void fireMissile(Entity *e);
 extern void addTeleportStars(Entity *e);
-extern void playSound(int snd, int ch);
 extern void playBattleSound(int snd, int ch, int x, int y);
 
 extern Entity *self;
diff --git a/src/hub/postMission.h b/src/hub/postMission.h
index 1c69cb8..b71b557 100644
--- a/src/hub/postMission.h
+++ b/src/hub/postMission.h
@@ -37,7 +37,6 @@ extern void clearControls(void);
 extern void restoreGameState(void);
 extern void initWorld(void);
 extern void initTitle(void);
-extern void awardTrophy(char *id);
 
 extern App app;
 extern Colors colors;
diff --git a/src/test/atlasTest.h b/src/test/atlasTest.h
index db1f0ac..c3005f9 100644
--- a/src/test/atlasTest.h
+++ b/src/test/atlasTest.h
@@ -27,6 +27,5 @@ extern void saveGame(void);
 extern void initOptions(void);
 extern void createScreenshotFolder(void);
 
-extern App app;
 extern Dev dev;
 extern Game game;
diff --git a/src/world/entities.h b/src/world/entities.h
index 8fa4940..dda12dc 100644
--- a/src/world/entities.h
+++ b/src/world/entities.h
@@ -28,7 +28,6 @@ extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int
 extern void addTeleportStars(Entity *e);
 extern void removeFromQuadtree(Entity *e, Quadtree *root);
 extern Sprite *getSprite(char *name);
-extern void playSound(int snd, int ch);
 extern void addTeleportStar(float x, float y);
 extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2);
 extern int getDistance(int x1, int y1, int x2, int y2);
diff --git a/src/world/player.h b/src/world/player.h
index f5ad3bf..19e4ea4 100644
--- a/src/world/player.h
+++ b/src/world/player.h
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern void quitMission(void);
 extern void autoCompleteMission(void);
-extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore);
 
 extern App app;
 extern Dev dev;
diff --git a/src/world/world.h b/src/world/world.h
index 3e425c7..1842544 100644
--- a/src/world/world.h
+++ b/src/world/world.h
@@ -37,7 +37,6 @@ extern void doLocationTriggers(void);
 extern void dropCarriedItems(void);
 extern void playSound(int snd, int ch);
 extern void initEnding(void);
-extern void initTitle(void);
 extern float cameraChase(Entity *e, int maxSpeed);
 extern int rrnd(int low, int high);
 extern void hideAllWidgets(void);