From 2634a6fd979a57a96658b7305230235ae7addfef Mon Sep 17 00:00:00 2001 From: Steve Date: Thu, 1 Mar 2018 07:52:50 +0000 Subject: [PATCH] Tidied all header. --- src/combat/combat.h | 5 +- src/combat/explosions.h | 9 +- src/combat/weapons.h | 15 +-- src/entities/blobs/bob.h | 33 +++--- src/entities/blobs/mia.h | 9 +- src/entities/blobs/teeka.h | 15 +-- src/entities/boss/blaze.h | 3 +- src/entities/boss/blobBoss.h | 23 ++-- src/entities/boss/boss.h | 3 +- src/entities/boss/eyeDroidCommander.h | 27 ++--- src/entities/boss/frost.h | 3 +- src/entities/boss/tankCommander.h | 25 ++-- src/entities/boss/tankTrack.h | 5 +- src/entities/bullets/bullet.h | 5 +- src/entities/bullets/grenade.h | 9 +- src/entities/bullets/laser.h | 7 +- src/entities/bullets/missile.h | 5 +- src/entities/cannons/cannon.h | 15 +-- src/entities/decoration/debris.h | 3 +- src/entities/decoration/fleshChunk.h | 3 +- src/entities/entity.h | 1 + src/entities/entityFactory.h | 87 +++++++------- src/entities/evilBlobs/evilBlob.h | 21 ++-- src/entities/evilBlobs/grenadeBlob.h | 1 + src/entities/evilBlobs/laserBlob.h | 1 + src/entities/evilBlobs/machineGunBlob.h | 1 + src/entities/evilBlobs/plasmaBlob.h | 1 + src/entities/evilBlobs/spreadGunBlob.h | 1 + src/entities/eyeDroids/eyeDroid.h | 25 ++-- src/entities/eyeDroids/grenadeDroid.h | 1 + src/entities/eyeDroids/laserDroid.h | 1 + src/entities/eyeDroids/machineGunDroid.h | 1 + src/entities/eyeDroids/plasmaDroid.h | 1 + src/entities/eyeDroids/spreadGunDroid.h | 1 + src/entities/items/battery.h | 3 +- src/entities/items/cell.h | 3 +- src/entities/items/cherry.h | 9 +- src/entities/items/consumable.h | 1 + src/entities/items/heart.h | 7 +- src/entities/items/item.h | 11 +- src/entities/items/key.h | 1 + src/entities/items/keycard.h | 7 +- src/entities/items/weaponPickup.h | 11 +- src/entities/misc/destructable.h | 9 +- src/entities/misc/infoPoint.h | 3 +- src/entities/structures/cardReader.h | 11 +- src/entities/structures/door.h | 17 +-- src/entities/structures/exit.h | 5 +- src/entities/structures/horizontalDoor.h | 1 + src/entities/structures/itemPad.h | 9 +- src/entities/structures/lift.h | 11 +- src/entities/structures/powerPoint.h | 5 +- src/entities/structures/powerPool.h | 1 + src/entities/structures/pressurePlate.h | 3 +- src/entities/structures/pushBlock.h | 3 +- src/entities/structures/structures.h | 1 + src/entities/structures/teleporter.h | 9 +- src/entities/traps/horizontalLaserTrap.h | 1 + src/entities/traps/laserTrap.h | 19 +-- src/entities/unit.h | 25 ++-- src/game/game.h | 9 +- src/game/options.h | 17 +-- src/game/stats.h | 19 +-- src/game/title.h | 1 + src/game/trophies.h | 29 ++--- src/hub/hub.h | 73 ++++++------ src/hub/postMission.h | 25 ++-- src/main.h | 32 ++--- src/plat/unix/unixInit.h | 1 + src/plat/win32/win32Init.h | 1 + src/system/atlas.h | 2 +- src/system/controls.h | 1 + src/system/draw.h | 1 + src/system/i18n.h | 4 +- src/system/init.h | 37 +++--- src/system/input.h | 5 +- src/system/io.h | 1 + src/system/sound.h | 7 +- src/system/sprites.h | 5 +- src/system/text.h | 1 + src/system/textures.h | 1 + src/system/transition.h | 4 +- src/system/widgets.h | 21 ++-- src/test/atlasTest.h | 7 +- src/world/camera.h | 1 + src/world/effects.h | 5 +- src/world/entities.h | 25 ++-- src/world/hud.h | 24 ++-- src/world/items.h | 5 +- src/world/map.h | 9 +- src/world/objectives.h | 1 + src/world/particles.h | 13 ++- src/world/player.h | 3 +- src/world/quadtree.h | 3 +- src/world/radar.h | 39 ++++--- src/world/triggers.h | 3 +- src/world/world.h | 141 ++++++++++++----------- src/world/worldLoader.h | 3 +- src/world/worldSaver.h | 1 + 99 files changed, 614 insertions(+), 518 deletions(-) diff --git a/src/combat/combat.h b/src/combat/combat.h index 8cffa30..06118ff 100644 --- a/src/combat/combat.h +++ b/src/combat/combat.h @@ -20,9 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern int isSolid(int x, int y); +extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore); extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); -extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); +extern int isSolid(int x, int y); extern World world; + diff --git a/src/combat/explosions.h b/src/combat/explosions.h index 00524a7..48ec7d8 100644 --- a/src/combat/explosions.h +++ b/src/combat/explosions.h @@ -20,13 +20,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern int rrnd(int low, int high); -extern void stunBob(void); extern void addExplosionParticles(float x, float y, float radius, int amount); -extern void playBattleSound(int snd, int ch, int x, int y); +extern void awardTrophy(char *id); 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 stunBob(void); extern void swapSelf(Entity *e); -extern void awardTrophy(char *id); extern Game game; + diff --git a/src/combat/weapons.h b/src/combat/weapons.h index e6ef908..c8b8545 100644 --- a/src/combat/weapons.h +++ b/src/combat/weapons.h @@ -20,14 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern Sprite *getSprite(char *name); -extern void playBattleSound(int snd, int ch, int x, int y); -extern int rrnd(int low, int high); -extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); -extern void initLaser(Bullet *b); -extern void initGrenade(Bullet *b); -extern void initMissile(Bullet *b); extern Bullet *createBaseBullet(Unit *owner); +extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); +extern Sprite *getSprite(char *name); +extern void initGrenade(Bullet *b); +extern void initLaser(Bullet *b); +extern void initMissile(Bullet *b); +extern void playBattleSound(int snd, int ch, int x, int y); extern void playSound(int snd, int ch); +extern int rrnd(int low, int high); extern World world; + diff --git a/src/entities/blobs/bob.h b/src/entities/blobs/bob.h index 8d80249..0f7e3ed 100644 --- a/src/entities/blobs/bob.h +++ b/src/entities/blobs/bob.h @@ -21,32 +21,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" -#define WALK_SPEED 5 -#define SWIM_SPEED 3 #define FLY_ACCEL 0.1 #define FLY_SPEED 8 +#define SWIM_SPEED 3 +#define WALK_SPEED 5 -extern Sprite *getSprite(char *name); -extern char *getLookupName(const char *prefix, long num); -extern long lookup(const char *name); -extern double randF(void); -extern int rrnd(int low, int high); -extern float limit(float i, float a, float b); -extern int isSolid(int x, int y); -extern void setGameplayMessage(int type, char *format, ...); -extern void playSound(int snd, int ch); extern void addFlameParticles(float x, float y); -extern void throwFleshChunks(float x, float y, int amount); -extern void firePistol(void); +extern void addTeleportStars(Entity *e); +extern void clearControl(int type); extern void fireGrenade(Entity *e); +extern void fireLaser(Entity *e); +extern void firePistol(void); extern void firePlasma(Entity *e); extern void fireSpread(Entity *e, int n); -extern void fireLaser(Entity *e); -extern void addTeleportStars(Entity *e); +extern char *getLookupName(const char *prefix, long num); +extern Sprite *getSprite(char *name); extern void initEntity(Entity *e); extern int isControl(int type); -extern void clearControl(int type); +extern int isSolid(int x, int y); +extern float limit(float i, float a, float b); +extern long lookup(const char *name); +extern void playSound(int snd, int ch); +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 Dev dev; extern Game game; extern World world; + diff --git a/src/entities/blobs/mia.h b/src/entities/blobs/mia.h index cfd31be..d1edc0a 100644 --- a/src/entities/blobs/mia.h +++ b/src/entities/blobs/mia.h @@ -21,14 +21,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" -extern Sprite *getSprite(char *name); extern void addMIATeleportStars(float x, float y); extern void addTeleportStars(Entity *e); -extern void setGameplayMessage(int type, char *format, ...); -extern void playSound(int snd, int ch); -extern void updateObjective(char *targetName); +extern Sprite *getSprite(char *name); extern void initEntity(Entity *e); +extern void playSound(int snd, int ch); +extern void setGameplayMessage(int type, char *format, ...); +extern void updateObjective(char *targetName); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/blobs/teeka.h b/src/entities/blobs/teeka.h index 800498b..7787b86 100644 --- a/src/entities/blobs/teeka.h +++ b/src/entities/blobs/teeka.h @@ -20,15 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern Unit *createUnit(void); -extern Sprite *getSprite(char *name); -extern int rrnd(int low, int high); -extern Bullet *createBaseBullet(Unit *owner); -extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); -extern int getDistance(int x1, int y1, int x2, int y2); -extern int hasLineOfSight(Entity *src, Entity *dest); extern void addTeleportStars(Entity *e); +extern Bullet *createBaseBullet(Unit *owner); +extern Unit *createUnit(void); +extern int getDistance(int x1, int y1, int x2, int y2); +extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); +extern Sprite *getSprite(char *name); +extern int hasLineOfSight(Entity *src, Entity *dest); extern void playBattleSound(int snd, int ch, int x, int y); +extern int rrnd(int low, int high); extern Entity *self; extern World world; + diff --git a/src/entities/boss/blaze.h b/src/entities/boss/blaze.h index d8751b9..bcff580 100644 --- a/src/entities/boss/blaze.h +++ b/src/entities/boss/blaze.h @@ -20,5 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern Boss *initBlobBoss(void); extern Sprite *getSprite(char *name); +extern Boss *initBlobBoss(void); + diff --git a/src/entities/boss/blobBoss.h b/src/entities/boss/blobBoss.h index e263d95..8165849 100644 --- a/src/entities/boss/blobBoss.h +++ b/src/entities/boss/blobBoss.h @@ -20,23 +20,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern Boss *initBoss(void); -extern int rrnd(int low, int high); extern void addTeleportStars(Entity *e); -extern void playMusic(int loop); -extern int isPlayingMusic(void); -extern float limit(float i, float a, float b); -extern double randF(void); -extern void playBattleSound(int snd, int ch, int x, int y); +extern void awardTrophy(char *id); extern Bullet *createBaseBullet(Unit *owner); -extern Sprite *getSprite(char *name); +extern int enemyCanSeePlayer(Entity *e); +extern void entityIdle(void); extern int getDistance(int x1, int y1, int x2, int y2); extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); -extern int enemyCanSeePlayer(Entity *e); +extern Sprite *getSprite(char *name); +extern Boss *initBoss(void); +extern int isPlayingMusic(void); +extern float limit(float i, float a, float b); +extern void playBattleSound(int snd, int ch, int x, int y); +extern void playMusic(int loop); +extern double randF(void); +extern int rrnd(int low, int high); extern void updateObjective(char *targetName); -extern void awardTrophy(char *id); -extern void entityIdle(void); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/boss/boss.h b/src/entities/boss/boss.h index 2b54b71..4a1cff6 100644 --- a/src/entities/boss/boss.h +++ b/src/entities/boss/boss.h @@ -20,7 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern void initEntity(Entity *e); extern Sprite *getSprite(char *name); +extern void initEntity(Entity *e); extern World world; + diff --git a/src/entities/boss/eyeDroidCommander.h b/src/entities/boss/eyeDroidCommander.h index 85b654a..135b944 100644 --- a/src/entities/boss/eyeDroidCommander.h +++ b/src/entities/boss/eyeDroidCommander.h @@ -20,25 +20,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern Boss *initBoss(void); -extern Sprite *getSprite(char *name); -extern void playMusic(int loop); -extern void addTeleportStars(Entity *e); -extern float limit(float i, float a, float b); -extern void addSmokeParticles(float x, float y, int rising); -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 double randF(void); -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); +extern void addSmokeParticles(float x, float y, int rising); +extern void addTeleportStars(Entity *e); extern void awardTrophy(char *id); +extern Bullet *createBaseBullet(Unit *owner); +extern int enemyCanSeePlayer(Entity *e); extern void entityIdle(void); +extern int getDistance(int x1, int y1, int x2, int y2); +extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); +extern Sprite *getSprite(char *name); +extern Boss *initBoss(void); extern void initMissile(Bullet *b); +extern float limit(float i, float a, float b); extern void playBattleSound(int snd, int ch, int x, int y); +extern void playMusic(int loop); +extern double randF(void); +extern int rrnd(int low, int high); +extern void updateObjective(char *targetName); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/boss/frost.h b/src/entities/boss/frost.h index d8751b9..bcff580 100644 --- a/src/entities/boss/frost.h +++ b/src/entities/boss/frost.h @@ -20,5 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern Boss *initBlobBoss(void); extern Sprite *getSprite(char *name); +extern Boss *initBlobBoss(void); + diff --git a/src/entities/boss/tankCommander.h b/src/entities/boss/tankCommander.h index 885f88f..45ad246 100644 --- a/src/entities/boss/tankCommander.h +++ b/src/entities/boss/tankCommander.h @@ -20,25 +20,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern Boss *initBoss(void); -extern Sprite *getSprite(char *name); -extern void playMusic(int loop); -extern void addTeleportStars(Entity *e); -extern float limit(float i, float a, float b); -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 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); extern void addScorchDecal(int x, int y); -extern Entity *initTankTrack(Boss *owner); +extern void addTeleportStars(Entity *e); extern void awardTrophy(char *id); +extern Bullet *createBaseBullet(Unit *owner); +extern int enemyCanSeePlayer(Entity *e); extern void entityIdle(void); +extern int getDistance(int x1, int y1, int x2, int y2); +extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); +extern Sprite *getSprite(char *name); +extern Boss *initBoss(void); extern void initMissile(Bullet *b); +extern Entity *initTankTrack(Boss *owner); +extern float limit(float i, float a, float b); extern void playBattleSound(int snd, int ch, int x, int y); +extern void playMusic(int loop); +extern int rrnd(int low, int high); +extern void updateObjective(char *targetName); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/boss/tankTrack.h b/src/entities/boss/tankTrack.h index 805561e..f32efd9 100644 --- a/src/entities/boss/tankTrack.h +++ b/src/entities/boss/tankTrack.h @@ -20,10 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern Boss *initBoss(void); extern Sprite *getSprite(char *name); -extern int rrnd(int low, int high); +extern Boss *initBoss(void); extern void playSound(int snd, int ch); +extern int rrnd(int low, int high); extern Entity *self; extern World world; + diff --git a/src/entities/bullets/bullet.h b/src/entities/bullets/bullet.h index 20e838d..ea8c5c0 100644 --- a/src/entities/bullets/bullet.h +++ b/src/entities/bullets/bullet.h @@ -20,14 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern void initEntity(Entity *e); extern void addSmallFleshChunk(float x, float y); extern void addSparkParticles(float x, float y); extern Bullet *createBaseBullet(Unit *owner); -extern void swapSelf(Entity *e); +extern void initEntity(Entity *e); extern void playBattleSound(int snd, int ch, int x, int y); +extern void swapSelf(Entity *e); extern Camera camera; extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/bullets/grenade.h b/src/entities/bullets/grenade.h index 4bcacc8..3b4d4bb 100644 --- a/src/entities/bullets/grenade.h +++ b/src/entities/bullets/grenade.h @@ -20,14 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern void initGrenade(Bullet *b); -extern void addSmallFleshChunk(float x, float y); -extern void addSparkParticles(float x, float y); extern void addExplosion(float x, float y, int radius, Entity *owner); extern void addScorchDecal(int x, int y); -extern void swapSelf(Entity *e); +extern void addSmallFleshChunk(float x, float y); +extern void addSparkParticles(float x, float y); +extern void initGrenade(Bullet *b); extern void playBattleSound(int snd, int ch, int x, int y); +extern void swapSelf(Entity *e); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/bullets/laser.h b/src/entities/bullets/laser.h index ee9bc78..922e255 100644 --- a/src/entities/bullets/laser.h +++ b/src/entities/bullets/laser.h @@ -20,14 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern int rrnd(int low, int high); -extern void initLaser(Bullet *b); extern void addSmallFleshChunk(float x, float y); extern void addSparkParticles(float x, float y); +extern void initLaser(Bullet *b); +extern void playBattleSound(int snd, int ch, int x, int y); +extern int rrnd(int low, int high); extern void stunBob(void); extern void swapSelf(Entity *e); -extern void playBattleSound(int snd, int ch, int x, int y); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/bullets/missile.h b/src/entities/bullets/missile.h index fc3e5d1..7a64c09 100644 --- a/src/entities/bullets/missile.h +++ b/src/entities/bullets/missile.h @@ -20,9 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern int rrnd(int low, int high); -extern void initMissile(Bullet *b); extern void addExplosion(float x, float y, int radius, Entity *owner); extern void addFlameParticles(float x, float y); +extern void initMissile(Bullet *b); +extern int rrnd(int low, int high); extern Entity *self; + diff --git a/src/entities/cannons/cannon.h b/src/entities/cannons/cannon.h index 0e59712..f12766b 100644 --- a/src/entities/cannons/cannon.h +++ b/src/entities/cannons/cannon.h @@ -21,17 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" extern void addExplosion(float x, float y, int radius, Entity *owner); -extern int rrnd(int low, int high); -extern Sprite *getSprite(char *name); -extern int getDistance(int x1, int y1, int x2, int y2); -extern int enemyCanSeePlayer(Entity *e); -extern void updateObjective(char *targetName); -extern void fireTriggers(char *targetName); -extern void dropCarriedItem(void); extern void addScorchDecal(int x, int y); extern Unit *createUnit(void); +extern void dropCarriedItem(void); +extern int enemyCanSeePlayer(Entity *e); +extern void fireTriggers(char *targetName); +extern int getDistance(int x1, int y1, int x2, int y2); +extern Sprite *getSprite(char *name); extern double randF(void); +extern int rrnd(int low, int high); +extern void updateObjective(char *targetName); extern Dev dev; extern Entity *self; extern World world; + diff --git a/src/entities/decoration/debris.h b/src/entities/decoration/debris.h index e9bf36a..aef3ae4 100644 --- a/src/entities/decoration/debris.h +++ b/src/entities/decoration/debris.h @@ -20,8 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern void initEntity(Entity *e); extern void addFlameParticles(float x, float y, int rising); extern void addSmokeParticles(float x, float y, int rising); +extern void initEntity(Entity *e); extern Entity *self; + diff --git a/src/entities/decoration/fleshChunk.h b/src/entities/decoration/fleshChunk.h index d84507a..0ff41ce 100644 --- a/src/entities/decoration/fleshChunk.h +++ b/src/entities/decoration/fleshChunk.h @@ -20,8 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern void initEntity(Entity *e); extern void addBlood(float x, float y); +extern void initEntity(Entity *e); extern App app; extern Entity *self; + diff --git a/src/entities/entity.h b/src/entities/entity.h index 3377cd3..cc21e40 100644 --- a/src/entities/entity.h +++ b/src/entities/entity.h @@ -22,3 +22,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern Entity *self; extern World world; + diff --git a/src/entities/entityFactory.h b/src/entities/entityFactory.h index e03e96d..e2074e0 100644 --- a/src/entities/entityFactory.h +++ b/src/entities/entityFactory.h @@ -21,57 +21,58 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" extern Entity *initAquaBlob(void); +extern Entity *initBlaze(void); +extern Entity *initBlueKeycard(void); +extern Entity *initBob(void); +extern Entity *initBronzeDoor(void); +extern Entity *initBronzeKey(void); +extern Entity *initCannon(void); +extern Entity *initCardReader(void); +extern Entity *initCell(void); +extern Entity *initDestructable(void); +extern Entity *initDoor(void); +extern Entity *initExit(void); +extern Entity *initEyeDroidCommander(void); +extern Entity *initFrost(void); +extern Entity *initGoldDoor(void); +extern Entity *initGoldKey(void); +extern Entity *initGreenKeycard(void); +extern Entity *initGrenadeBlob(void); +extern Entity *initGrenadeDroid(void); +extern Entity *initHeart(void); +extern Entity *initHorizontalDoor(void); +extern Entity *initHorizontalLaserTrap(void); +extern Entity *initInfoPoint(void); +extern Entity *initItem(void); +extern Entity *initItemPad(void); +extern Entity *initLaserBlob(void); +extern Entity *initLaserDroid(void); +extern Entity *initLaserTrap(void); +extern Entity *initLift(void); +extern Entity *initMIA(void); extern Entity *initMachineGunBlob(void); +extern Entity *initMachineGunDroid(void); extern Entity *initPistolBlob(void); extern Entity *initPistolDroid(void); -extern Entity *initGrenadeDroid(void); -extern Entity *initGrenadeBlob(void); -extern Entity *initShotgunDroid(void); -extern Entity *initShotgunBlob(void); -extern Entity *initBob(void); -extern Entity *initExit(void); -extern Entity *initPowerPool(void); -extern Entity *initTeleporter(void); -extern Entity *initPressurePlate(void); -extern Entity *initInfoPoint(void); +extern Entity *initPlasmaBlob(void); +extern Entity *initPlasmaDroid(void); extern Entity *initPowerPoint(void); +extern Entity *initPowerPool(void); +extern Entity *initPressurePlate(void); extern Entity *initPushBlock(void); -extern Entity *initLift(void); -extern Entity *initDoor(void); -extern Entity *initBronzeDoor(void); -extern Entity *initSilverDoor(void); -extern Entity *initGoldDoor(void); -extern Entity *initHorizontalDoor(void); -extern Entity *initMIA(void); -extern Entity *initItem(void); -extern Entity *initBronzeKey(void); -extern Entity *initSilverKey(void); -extern Entity *initGoldKey(void); -extern Entity *initCell(void); -extern Entity *initHeart(void); -extern Entity *initGreenKeycard(void); -extern Entity *initCardReader(void); -extern Entity *initBlueKeycard(void); extern Entity *initRedKeycard(void); -extern Entity *initYellowKeycard(void); -extern Entity *initWhiteKeycard(void); -extern Entity *initLaserTrap(void); -extern Entity *initHorizontalLaserTrap(void); -extern Entity *initMachineGunDroid(void); -extern Entity *initLaserDroid(void); -extern Entity *initLaserBlob(void); +extern Entity *initShotgunBlob(void); +extern Entity *initShotgunDroid(void); +extern Entity *initSilverDoor(void); +extern Entity *initSilverKey(void); extern Entity *initSpreadGunBlob(void); extern Entity *initSpreadGunDroid(void); -extern Entity *initPlasmaDroid(void); -extern Entity *initPlasmaBlob(void); -extern Entity *initTeeka(void); -extern Entity *initDestructable(void); -extern Entity *initCannon(void); -extern Entity *initItemPad(void); -extern Entity *initWeaponPickup(void); -extern Entity *initBlaze(void); -extern Entity *initFrost(void); -extern Entity *initEyeDroidCommander(void); extern Entity *initTankCommander(void); +extern Entity *initTeeka(void); +extern Entity *initTeleporter(void); +extern Entity *initWeaponPickup(void); +extern Entity *initWhiteKeycard(void); +extern Entity *initYellowKeycard(void); extern World world; + diff --git a/src/entities/evilBlobs/evilBlob.h b/src/entities/evilBlobs/evilBlob.h index 66ac95e..8c10cd5 100644 --- a/src/entities/evilBlobs/evilBlob.h +++ b/src/entities/evilBlobs/evilBlob.h @@ -20,22 +20,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern void dropCarriedItem(void); -extern int getDistance(int x1, int y1, int x2, int y2); -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 addBloodDecal(int x, int y); -extern void updateObjective(char *targetName); +extern void addRandomItems(int x, int y); +extern void addRandomWeapon(int x, int y); +extern Unit *createUnit(void); +extern void dropCarriedItem(void); extern int enemyCanSeePlayer(Entity *e); extern void fireTriggers(char *name); -extern void addRandomItems(int x, int y); -extern int rrnd(int low, int high); -extern Unit *createUnit(void); +extern int getDistance(int x1, int y1, int x2, int y2); +extern float limit(float i, float a, float b); extern void playBattleSound(int snd, int ch, int x, int y); +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 Dev dev; extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/evilBlobs/grenadeBlob.h b/src/entities/evilBlobs/grenadeBlob.h index cc1431d..a05bab5 100644 --- a/src/entities/evilBlobs/grenadeBlob.h +++ b/src/entities/evilBlobs/grenadeBlob.h @@ -24,3 +24,4 @@ extern Unit *createEvilBlob(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/evilBlobs/laserBlob.h b/src/entities/evilBlobs/laserBlob.h index cc1431d..a05bab5 100644 --- a/src/entities/evilBlobs/laserBlob.h +++ b/src/entities/evilBlobs/laserBlob.h @@ -24,3 +24,4 @@ extern Unit *createEvilBlob(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/evilBlobs/machineGunBlob.h b/src/entities/evilBlobs/machineGunBlob.h index cc1431d..a05bab5 100644 --- a/src/entities/evilBlobs/machineGunBlob.h +++ b/src/entities/evilBlobs/machineGunBlob.h @@ -24,3 +24,4 @@ extern Unit *createEvilBlob(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/evilBlobs/plasmaBlob.h b/src/entities/evilBlobs/plasmaBlob.h index cc1431d..a05bab5 100644 --- a/src/entities/evilBlobs/plasmaBlob.h +++ b/src/entities/evilBlobs/plasmaBlob.h @@ -24,3 +24,4 @@ extern Unit *createEvilBlob(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/evilBlobs/spreadGunBlob.h b/src/entities/evilBlobs/spreadGunBlob.h index cc1431d..a05bab5 100644 --- a/src/entities/evilBlobs/spreadGunBlob.h +++ b/src/entities/evilBlobs/spreadGunBlob.h @@ -24,3 +24,4 @@ extern Unit *createEvilBlob(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/eyeDroids/eyeDroid.h b/src/entities/eyeDroids/eyeDroid.h index fb4a0c1..5b8f3a2 100644 --- a/src/entities/eyeDroids/eyeDroid.h +++ b/src/entities/eyeDroids/eyeDroid.h @@ -20,24 +20,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern void dropCarriedItem(void); -extern int getDistance(int x1, int y1, int x2, int y2); -extern double randF(void); +extern void addExplosion(float x, float y, int radius, Entity *owner); +extern void addRandomItems(int x, int y); extern void addRandomWeapon(int x, int y); -extern float limit(float i, float a, float b); -extern void updateObjective(char *targetName); +extern void addScorchDecal(int x, int y); +extern void addSmokeParticles(float x, float y, int rising); +extern Unit *createUnit(void); +extern void dropCarriedItem(void); extern int enemyCanSeePlayer(Entity *e); extern void fireTriggers(char *name); -extern void addRandomItems(int x, int y); -extern int rrnd(int low, int high); -extern void addExplosion(float x, float y, int radius, Entity *owner); -extern void throwDebris(float x, float y, int amount); -extern void addSmokeParticles(float x, float y, int rising); -extern void addScorchDecal(int x, int y); -extern Unit *createUnit(void); +extern int getDistance(int x1, int y1, int x2, int y2); +extern float limit(float i, float a, float b); extern void playBattleSound(int snd, int ch, int x, int y); +extern double randF(void); +extern int rrnd(int low, int high); +extern void throwDebris(float x, float y, int amount); +extern void updateObjective(char *targetName); extern Dev dev; extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/eyeDroids/grenadeDroid.h b/src/entities/eyeDroids/grenadeDroid.h index 34975f9..019b604 100644 --- a/src/entities/eyeDroids/grenadeDroid.h +++ b/src/entities/eyeDroids/grenadeDroid.h @@ -24,3 +24,4 @@ extern Unit *createEyeDroid(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/eyeDroids/laserDroid.h b/src/entities/eyeDroids/laserDroid.h index 34975f9..019b604 100644 --- a/src/entities/eyeDroids/laserDroid.h +++ b/src/entities/eyeDroids/laserDroid.h @@ -24,3 +24,4 @@ extern Unit *createEyeDroid(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/eyeDroids/machineGunDroid.h b/src/entities/eyeDroids/machineGunDroid.h index 34975f9..019b604 100644 --- a/src/entities/eyeDroids/machineGunDroid.h +++ b/src/entities/eyeDroids/machineGunDroid.h @@ -24,3 +24,4 @@ extern Unit *createEyeDroid(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/eyeDroids/plasmaDroid.h b/src/entities/eyeDroids/plasmaDroid.h index 34975f9..019b604 100644 --- a/src/entities/eyeDroids/plasmaDroid.h +++ b/src/entities/eyeDroids/plasmaDroid.h @@ -24,3 +24,4 @@ extern Unit *createEyeDroid(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/eyeDroids/spreadGunDroid.h b/src/entities/eyeDroids/spreadGunDroid.h index 34975f9..019b604 100644 --- a/src/entities/eyeDroids/spreadGunDroid.h +++ b/src/entities/eyeDroids/spreadGunDroid.h @@ -24,3 +24,4 @@ extern Unit *createEyeDroid(void); extern Sprite *getSprite(char *name); extern Entity *self; + diff --git a/src/entities/items/battery.h b/src/entities/items/battery.h index 362171e..2a2b6e5 100644 --- a/src/entities/items/battery.h +++ b/src/entities/items/battery.h @@ -21,11 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" extern Item *initConsumable(void); -extern void playSound(int snd, int ch); extern void pickupItem(void); +extern void playSound(int snd, int ch); extern void setGameplayMessage(int type, char *format, ...); extern int touchedPlayer(Entity *e); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/items/cell.h b/src/entities/items/cell.h index 1fb8a6d..5c3ddba 100644 --- a/src/entities/items/cell.h +++ b/src/entities/items/cell.h @@ -22,10 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern Entity *createItem(void); extern Sprite *getSprite(char *name); -extern void setGameplayMessage(int type, char *format, ...); extern void playSound(int snd, int ch); +extern void setGameplayMessage(int type, char *format, ...); extern void updateObjective(char *targetName); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/items/cherry.h b/src/entities/items/cherry.h index 309002f..4347661 100644 --- a/src/entities/items/cherry.h +++ b/src/entities/items/cherry.h @@ -21,12 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" extern Item *initConsumable(void); -extern void setGameplayMessage(int type, char *format, ...); -extern void playSound(int snd, int ch); -extern int touchedPlayer(Entity *other); -extern void pickupItem(void); extern float limit(float i, float a, float b); +extern void pickupItem(void); +extern void playSound(int snd, int ch); +extern void setGameplayMessage(int type, char *format, ...); +extern int touchedPlayer(Entity *other); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/items/consumable.h b/src/entities/items/consumable.h index 7da08cf..6a39b8d 100644 --- a/src/entities/items/consumable.h +++ b/src/entities/items/consumable.h @@ -23,3 +23,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern void initEntity(Entity *e); extern Entity *self; + diff --git a/src/entities/items/heart.h b/src/entities/items/heart.h index ccd0289..3d0eb41 100644 --- a/src/entities/items/heart.h +++ b/src/entities/items/heart.h @@ -20,13 +20,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern void playSound(int snd, int ch); -extern void setGameplayMessage(int type, char *format, ...); extern Entity *createItem(void); extern Sprite *getSprite(char *name); -extern void updateObjective(char *targetName); +extern void playSound(int snd, int ch); extern int rrnd(int low, int high); +extern void setGameplayMessage(int type, char *format, ...); +extern void updateObjective(char *targetName); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/items/item.h b/src/entities/items/item.h index 44fc1b8..296558a 100644 --- a/src/entities/items/item.h +++ b/src/entities/items/item.h @@ -21,15 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" +extern int addItem(Item *i, int num); +extern void addTeleportStars(Entity *e); +extern Sprite *getSprite(char *name); +extern void initEntity(Entity *e); +extern void playBattleSound(int snd, int ch, int x, int y); extern void playSound(int snd, int ch); extern void setGameplayMessage(int type, char *format, ...); -extern void addTeleportStars(Entity *e); -extern void initEntity(Entity *e); -extern Sprite *getSprite(char *name); -extern int addItem(Item *i, int num); extern void updateObjective(char *targetName); -extern void playBattleSound(int snd, int ch, int x, int y); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/items/key.h b/src/entities/items/key.h index 550e089..2aa5207 100644 --- a/src/entities/items/key.h +++ b/src/entities/items/key.h @@ -21,3 +21,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" extern Entity *createItem(void); + diff --git a/src/entities/items/keycard.h b/src/entities/items/keycard.h index f74a649..ece356b 100644 --- a/src/entities/items/keycard.h +++ b/src/entities/items/keycard.h @@ -20,9 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" -extern Entity *createItem(void); -extern void updateObjective(char *targetName); -extern void teekaExitMission(void); extern void awardTrophy(char *id); +extern Entity *createItem(void); +extern void teekaExitMission(void); +extern void updateObjective(char *targetName); extern World world; + diff --git a/src/entities/items/weaponPickup.h b/src/entities/items/weaponPickup.h index 989a49d..815fdba 100644 --- a/src/entities/items/weaponPickup.h +++ b/src/entities/items/weaponPickup.h @@ -21,15 +21,16 @@ 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 setGameplayMessage(int type, char *format, ...); -extern Sprite *getSprite(char *name); -extern void pickupItem(void); -extern int touchedPlayer(Entity *e); extern const char *getWeaponName(int i); +extern Sprite *getSprite(char *name); extern Entity *initConsumable(void); extern int lookup(char *name); +extern void pickupItem(void); +extern void playSound(int snd, int ch); +extern void setGameplayMessage(int type, char *format, ...); +extern int touchedPlayer(Entity *e); extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/misc/destructable.h b/src/entities/misc/destructable.h index 8a678f9..7312027 100644 --- a/src/entities/misc/destructable.h +++ b/src/entities/misc/destructable.h @@ -22,12 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../json/cJSON.h" extern void activateEntities(char *names, int activate); -extern void dropCarriedItem(void); -extern int rrnd(int low, int high); extern void addExplosion(float x, float y, int radius, Entity *owner); extern void addScorchDecal(int x, int y); -extern Sprite *getSprite(char *name); -extern void updateObjective(char *targetName); extern Structure *createStructure(void); +extern void dropCarriedItem(void); +extern Sprite *getSprite(char *name); +extern int rrnd(int low, int high); +extern void updateObjective(char *targetName); extern Entity *self; + diff --git a/src/entities/misc/infoPoint.h b/src/entities/misc/infoPoint.h index c7d77d1..93944ce 100644 --- a/src/entities/misc/infoPoint.h +++ b/src/entities/misc/infoPoint.h @@ -21,9 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" +extern Structure *createStructure(void); extern Sprite *getSprite(char *name); extern void showInfoMessage(char *message); -extern Structure *createStructure(void); extern Entity *self; extern World world; + diff --git a/src/entities/structures/cardReader.h b/src/entities/structures/cardReader.h index 5107bbd..d94d495 100644 --- a/src/entities/structures/cardReader.h +++ b/src/entities/structures/cardReader.h @@ -21,13 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" -extern Sprite *getSprite(char *name); -extern void removeItem(char *name); -extern int hasItem(char *name); -extern void setGameplayMessage(int type, char *format, ...); extern void activateEntities(char *names, int activate); -extern void playSound(int snd, int ch); extern Structure *createStructure(void); +extern Sprite *getSprite(char *name); +extern int hasItem(char *name); +extern void playSound(int snd, int ch); +extern void removeItem(char *name); +extern void setGameplayMessage(int type, char *format, ...); extern Dev dev; extern Entity *self; + diff --git a/src/entities/structures/door.h b/src/entities/structures/door.h index 9c3e2c8..2ee9506 100644 --- a/src/entities/structures/door.h +++ b/src/entities/structures/door.h @@ -21,18 +21,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" -extern Sprite *getSprite(char *name); -extern void playSound(int snd, int ch); -extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); -extern void setGameplayMessage(int type, char *format, ...); -extern int hasItem(char *name); -extern void removeItem(char *name); extern Structure *createStructure(void); extern char *getLookupName(const char *prefix, long num); -extern long lookup(const char *name); +extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); +extern Sprite *getSprite(char *name); +extern int hasItem(char *name); extern int isOnScreen(Entity *e); +extern long lookup(const char *name); extern void observeActivation(Entity *e); extern void playBattleSound(int snd, int ch, int x, int y); +extern void playSound(int snd, int ch); +extern void removeItem(char *name); +extern void setGameplayMessage(int type, char *format, ...); -extern Entity *self; extern Dev dev; +extern Entity *self; + diff --git a/src/entities/structures/exit.h b/src/entities/structures/exit.h index b2afec4..dfecc6a 100644 --- a/src/entities/structures/exit.h +++ b/src/entities/structures/exit.h @@ -21,11 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" +extern Structure *createStructure(void); extern Sprite *getSprite(char *name); -extern void updateObjective(char *targetName); extern void setGameplayMessage(int type, char *format, ...); extern void stopMusic(void); -extern Structure *createStructure(void); +extern void updateObjective(char *targetName); extern Entity *self; extern World world; + diff --git a/src/entities/structures/horizontalDoor.h b/src/entities/structures/horizontalDoor.h index a1bba85..a366b64 100644 --- a/src/entities/structures/horizontalDoor.h +++ b/src/entities/structures/horizontalDoor.h @@ -22,3 +22,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern Sprite *getSprite(char *name); extern Entity *initDoor(void); + diff --git a/src/entities/structures/itemPad.h b/src/entities/structures/itemPad.h index 9a2a0a9..98cf5ef 100644 --- a/src/entities/structures/itemPad.h +++ b/src/entities/structures/itemPad.h @@ -22,11 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../json/cJSON.h" extern Structure *createStructure(void); -extern Sprite *getSprite(char *name); -extern void updateObjective(char *targetName); -extern void setGameplayMessage(int type, char *format, ...); -extern void removeItem(char *name); extern Item *getItem(char *name); +extern Sprite *getSprite(char *name); extern void playBattleSound(int snd, int ch, int x, int y); +extern void removeItem(char *name); +extern void setGameplayMessage(int type, char *format, ...); +extern void updateObjective(char *targetName); extern Entity *self; + diff --git a/src/entities/structures/lift.h b/src/entities/structures/lift.h index a40cdf8..7f8fc5c 100644 --- a/src/entities/structures/lift.h +++ b/src/entities/structures/lift.h @@ -21,13 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" -extern Sprite *getSprite(char *name); -extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); -extern void observeActivation(Entity *e); -extern int isOnScreen(Entity *e); -extern void setGameplayMessage(int type, char *format, ...); extern Structure *createStructure(void); extern char *getLookupName(const char *prefix, long num); +extern void getSlope(int x1, int y1, int x2, int y2, float *dx, float *dy); +extern Sprite *getSprite(char *name); +extern int isOnScreen(Entity *e); extern long lookup(const char *name); +extern void observeActivation(Entity *e); +extern void setGameplayMessage(int type, char *format, ...); extern Entity *self; + diff --git a/src/entities/structures/powerPoint.h b/src/entities/structures/powerPoint.h index 5e39036..1f5a23b 100644 --- a/src/entities/structures/powerPoint.h +++ b/src/entities/structures/powerPoint.h @@ -21,13 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" -extern Sprite *getSprite(char *name); extern void activateEntities(char *names, int activate); -extern void setGameplayMessage(int type, char *format, ...); extern Structure *createStructure(void); +extern Sprite *getSprite(char *name); extern int rrnd(int low, int high); +extern void setGameplayMessage(int type, char *format, ...); extern Dev dev; extern Entity *self; extern Game game; extern World world; + diff --git a/src/entities/structures/powerPool.h b/src/entities/structures/powerPool.h index 2765461..1c1aab6 100644 --- a/src/entities/structures/powerPool.h +++ b/src/entities/structures/powerPool.h @@ -26,3 +26,4 @@ extern Sprite *getSprite(char *name); extern Entity *self; extern World world; + diff --git a/src/entities/structures/pressurePlate.h b/src/entities/structures/pressurePlate.h index dc4a13e..42f3306 100644 --- a/src/entities/structures/pressurePlate.h +++ b/src/entities/structures/pressurePlate.h @@ -21,9 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" +extern void activateEntities(char *names, int activate); extern Structure *createStructure(void); extern Sprite *getSprite(char *name); -extern void activateEntities(char *names, int activate); 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 b72e57a..7ab46c6 100644 --- a/src/entities/structures/pushBlock.h +++ b/src/entities/structures/pushBlock.h @@ -24,7 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern void addTeleportStars(Entity *e); extern Structure *createStructure(void); extern Sprite *getSprite(char *name); -extern int rrnd(int low, int high); extern void playBattleSound(int snd, int ch, int x, int y); +extern int rrnd(int low, int high); extern Entity *self; + diff --git a/src/entities/structures/structures.h b/src/entities/structures/structures.h index 7caefce..f14e979 100644 --- a/src/entities/structures/structures.h +++ b/src/entities/structures/structures.h @@ -21,3 +21,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" extern void initEntity(Entity *e); + diff --git a/src/entities/structures/teleporter.h b/src/entities/structures/teleporter.h index ab0ffc3..a63d874 100644 --- a/src/entities/structures/teleporter.h +++ b/src/entities/structures/teleporter.h @@ -22,12 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../json/cJSON.h" extern void addTeleporterEffect(float x, float y); -extern void teleportEntity(Entity *e, float tx, float ty); -extern void observeActivation(Entity *e); -extern int isOnScreen(Entity *e); -extern void setGameplayMessage(int type, char *format, ...); extern Structure *createStructure(void); extern Sprite *getSprite(char *name); +extern int isOnScreen(Entity *e); +extern void observeActivation(Entity *e); extern void playBattleSound(int snd, int ch, int x, int y); +extern void setGameplayMessage(int type, char *format, ...); +extern void teleportEntity(Entity *e, float tx, float ty); extern Entity *self; + diff --git a/src/entities/traps/horizontalLaserTrap.h b/src/entities/traps/horizontalLaserTrap.h index 59e39a0..9fa4a1c 100644 --- a/src/entities/traps/horizontalLaserTrap.h +++ b/src/entities/traps/horizontalLaserTrap.h @@ -22,3 +22,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern Sprite *getSprite(char *name); extern Entity *initLaserTrap(void); + diff --git a/src/entities/traps/laserTrap.h b/src/entities/traps/laserTrap.h index ea9d24d..a88b702 100644 --- a/src/entities/traps/laserTrap.h +++ b/src/entities/traps/laserTrap.h @@ -21,17 +21,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../../common.h" #include "../../json/cJSON.h" -extern void initEntity(Entity *e); -extern void observeActivation(Entity *e); -extern int isOnScreen(Entity *e); -extern void setGameplayMessage(int type, char *format, ...); -extern Sprite *getSprite(char *name); -extern int rrnd(int low, int high); -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 addSparkParticles(float x, float y); +extern Sprite *getSprite(char *name); +extern void initEntity(Entity *e); +extern int isOnScreen(Entity *e); +extern void observeActivation(Entity *e); extern void playBattleSound(int snd, int ch, int x, int y); +extern int rrnd(int low, int high); +extern void setGameplayMessage(int type, char *format, ...); +extern void stunBob(void); +extern void swapSelf(Entity *e); extern Entity *self; extern World world; + diff --git a/src/entities/unit.h b/src/entities/unit.h index 36cb028..9eb335c 100644 --- a/src/entities/unit.h +++ b/src/entities/unit.h @@ -21,20 +21,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #include "../json/cJSON.h" -extern void initEntity(Entity *e); -extern int rrnd(int low, int high); -extern float limit(float i, float a, float b); -extern int getDistance(int x1, int y1, int x2, int y2); -extern void fireAimedShot(Entity *e); -extern void fireMachineGun(Entity *e); -extern void fireGrenade(Entity *e); -extern void firePlasma(Entity *e); -extern void fireSpread(Entity *e, int n); -extern void fireLaser(Entity *e); -extern void fireShotgun(Entity *e); -extern void fireMissile(Entity *e); extern void addTeleportStars(Entity *e); +extern void fireAimedShot(Entity *e); +extern void fireGrenade(Entity *e); +extern void fireLaser(Entity *e); +extern void fireMachineGun(Entity *e); +extern void fireMissile(Entity *e); +extern void firePlasma(Entity *e); +extern void fireShotgun(Entity *e); +extern void fireSpread(Entity *e, int n); +extern int getDistance(int x1, int y1, int x2, int y2); +extern void initEntity(Entity *e); +extern float limit(float i, float a, float b); extern void playBattleSound(int snd, int ch, int x, int y); +extern int rrnd(int low, int high); extern Entity *self; extern World world; + diff --git a/src/game/game.h b/src/game/game.h index f16eb43..08da853 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -21,15 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #include "../json/cJSON.h" -extern char *readFile(const char *filename); extern Entity *createEntity(char *name); -extern Trophy *getTrophy(char *id); -extern char *getLookupName(const char *prefix, long num); -extern int writeFile(const char *filename, const char *data); extern int fileExists(const char *filename); +extern char *getLookupName(const char *prefix, long num); +extern Trophy *getTrophy(char *id); extern int lookup(char *name); +extern char *readFile(const char *filename); +extern int writeFile(const char *filename, const char *data); extern App app; extern Entity *self; extern Game game; extern World world; + diff --git a/src/game/options.h b/src/game/options.h index ce6c573..5b489d5 100644 --- a/src/game/options.h +++ b/src/game/options.h @@ -27,18 +27,19 @@ enum SECTION_CONTROLS }; -extern void showWidgetGroup(char *group); -extern Widget *getWidget(char *name, char *group); -extern void drawWidgets(void); -extern Texture *getTexture(const char *filename); -extern Atlas *getImageFromAtlas(char *filename); -extern void doWidgets(void); extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); -extern void saveConfig(void); +extern void doWidgets(void); extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void startSectionTransition(void); +extern void drawWidgets(void); extern void endSectionTransition(void); +extern Atlas *getImageFromAtlas(char *filename); +extern Texture *getTexture(const char *filename); +extern Widget *getWidget(char *name, char *group); extern void playSound(int snd, int ch); +extern void saveConfig(void); +extern void showWidgetGroup(char *group); +extern void startSectionTransition(void); extern App app; extern Colors colors; + diff --git a/src/game/stats.h b/src/game/stats.h index b17afde..317dc6a 100644 --- a/src/game/stats.h +++ b/src/game/stats.h @@ -22,20 +22,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define STATS_PER_PAGE 9 -extern void drawWidgets(void); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern char *timeToString(int seconds, int showHours); -extern float limit(float i, float low, float high); -extern int isControl(int type); +extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); extern void clearControl(int type); +extern void doWidgets(void); +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 c, const char *format, ...); +extern void drawWidgets(void); extern Atlas *getImageFromAtlas(char *filename); extern Texture *getTexture(const char *filename); -extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); -extern void doWidgets(void); +extern int isControl(int type); +extern float limit(float i, float low, float high); extern void playSound(int snd, int ch); +extern char *timeToString(int seconds, int showHours); extern App app; extern Colors colors; extern Game game; + diff --git a/src/game/title.h b/src/game/title.h index 2ed81bd..20d7193 100644 --- a/src/game/title.h +++ b/src/game/title.h @@ -21,3 +21,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" extern App app; + diff --git a/src/game/trophies.h b/src/game/trophies.h index 54778bf..dc90ee4 100644 --- a/src/game/trophies.h +++ b/src/game/trophies.h @@ -24,27 +24,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TROPHIES_PER_PAGE 4 -extern char *readFile(const char *filename); -extern long lookup(const char *name); -extern void textSize(char *text, int size, int *w, int *h); -extern void playSound(int snd, int ch); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern float mod(float n, float x); -extern Atlas *getImageFromAtlas(char *filename); extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); extern void blitRectRotated(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, float angle); -extern Texture *getTexture(const char *filename); extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); -extern void saveScreenshot(char *name); -extern void drawWidgets(void); -extern float limit(float i, float low, float high); -extern int isControl(int type); extern void clearControl(int type); extern void doWidgets(void); +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 c, const char *format, ...); +extern void drawWidgets(void); +extern Atlas *getImageFromAtlas(char *filename); +extern Texture *getTexture(const char *filename); +extern int isControl(int type); +extern float limit(float i, float low, float high); +extern long lookup(const char *name); +extern float mod(float n, float x); +extern void playSound(int snd, int ch); +extern char *readFile(const char *filename); +extern void saveScreenshot(char *name); +extern void textSize(char *text, int size, int *w, int *h); extern char *timeToDate(long millis); extern App app; extern Colors colors; extern Game game; + diff --git a/src/hub/hub.h b/src/hub/hub.h index 357957c..dcf60db 100644 --- a/src/hub/hub.h +++ b/src/hub/hub.h @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #include "../json/cJSON.h" -#define CURSOR_SPEED 8 - enum { SHOW_NONE, @@ -31,48 +29,51 @@ enum SHOW_TROPHIES }; -extern int getDistance(int x1, int y1, int x2, int y2); -extern char *readFile(const char *filename); -extern Atlas *getImageFromAtlas(char *filename); -extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); -extern Texture *getTexture(const char *filename); -extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void limitTextWidth(int width); -extern Sprite *getSprite(char *name); -extern SDL_Rect *getCurrentFrame(Sprite *s); +#define CURSOR_SPEED 8 + extern void animateSprites(void); -extern int isControl(int type); +extern void awardTrophy(char *id); +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 int clearControl(int type); -extern void saveGame(void); -extern void hideAllWidgets(void); -extern void showWidgetGroup(char *group); -extern Widget *getWidget(char *name, char *group); +extern void doStats(void); +extern void doTrophies(void); +extern void doWidgets(void); +extern void drawBackground(SDL_Texture *texture, SDL_Rect *srcRect); +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 drawStats(void); +extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); +extern void drawTrophies(void); +extern void drawWidgetFrame(void); extern void drawWidgets(void); -extern Widget *selectWidgetAt(int x, int y); +extern void endSectionTransition(void); +extern SDL_Rect *getCurrentFrame(Sprite *s); +extern int getDistance(int x1, int y1, int x2, int y2); +extern Atlas *getImageFromAtlas(char *filename); +extern int getMissionStatus(char *id); +extern Sprite *getSprite(char *name); +extern Texture *getTexture(const char *filename); +extern Widget *getWidget(char *name, char *group); +extern void hideAllWidgets(void); +extern void initOptions(void (*callback)(void)); +extern void initWorld(void); +extern int isControl(int type); +extern void limitTextWidth(int width); extern void loadMusic(char *filename); extern void playMusic(int loop); -extern void stopMusic(void); -extern void startSectionTransition(void); -extern void endSectionTransition(void); -extern void initWorld(void); -extern void drawBackground(SDL_Texture *texture, SDL_Rect *srcRect); -extern void scrollBackground(float x, float y); -extern double randF(void); -extern void doWidgets(void); -extern void drawStats(void); -extern void doStats(void); -extern void awardTrophy(char *id); -extern void doTrophies(void); -extern void drawTrophies(void); -extern void initOptions(void (*callback)(void)); -extern int getMissionStatus(char *id); -extern void drawWidgetFrame(void); extern void playSound(int snd, int ch); +extern double randF(void); +extern char *readFile(const char *filename); +extern void saveGame(void); +extern void scrollBackground(float x, float y); +extern Widget *selectWidgetAt(int x, int y); +extern void showWidgetGroup(char *group); +extern void startSectionTransition(void); +extern void stopMusic(void); extern App app; extern Colors colors; extern Dev dev; extern Game game; + diff --git a/src/hub/postMission.h b/src/hub/postMission.h index b71b557..611bc3e 100644 --- a/src/hub/postMission.h +++ b/src/hub/postMission.h @@ -20,25 +20,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern void startSectionTransition(void); -extern void endSectionTransition(void); -extern void initHub(void); -extern void saveGame(void); -extern void saveWorld(void); -extern void destroyWorld(void); -extern Texture *getTexture(const char *filename); -extern Atlas *getImageFromAtlas(char *filename); extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); +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, ...); +extern void endSectionTransition(void); +extern Atlas *getImageFromAtlas(char *filename); +extern Texture *getTexture(const char *filename); +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); extern void playSound(int snd, int ch); -extern int isAcceptControl(void); -extern void clearControls(void); extern void restoreGameState(void); -extern void initWorld(void); -extern void initTitle(void); +extern void saveGame(void); +extern void saveWorld(void); +extern void startSectionTransition(void); extern App app; extern Colors colors; extern Game game; extern World world; + diff --git a/src/main.h b/src/main.h index 85de0fe..20aa3b0 100644 --- a/src/main.h +++ b/src/main.h @@ -21,22 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "common.h" #include -extern void cleanup(void); -extern void initSDL(void); -extern void initGameSystem(void); -extern void handleInput(void); -extern void prepareScene(void); -extern void presentScene(void); -extern void initAtlasTest(void); -extern void init18N(int argc, char *argv[]); -extern void initLookups(void); -extern void awardTrophies(void); -extern void doTrophyAlerts(void); -extern void drawTrophyAlert(void); -extern void expireTexts(int all); -extern void saveTrophyScreenshot(void); -extern void saveScreenshot(char *name); - App app; Camera camera; Colors colors; @@ -44,3 +28,19 @@ Dev dev; Entity *self; Game game; World world; +extern void awardTrophies(void); +extern void cleanup(void); +extern void doTrophyAlerts(void); +extern void drawTrophyAlert(void); +extern void expireTexts(int all); +extern void handleInput(void); +extern void init18N(int argc, char *argv[]); +extern void initAtlasTest(void); +extern void initGameSystem(void); +extern void initLookups(void); +extern void initSDL(void); +extern void prepareScene(void); +extern void presentScene(void); +extern void saveScreenshot(char *name); +extern void saveTrophyScreenshot(void); + diff --git a/src/plat/unix/unixInit.h b/src/plat/unix/unixInit.h index 3d612a0..3ef55d2 100644 --- a/src/plat/unix/unixInit.h +++ b/src/plat/unix/unixInit.h @@ -27,3 +27,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern App app; extern Dev dev; + diff --git a/src/plat/win32/win32Init.h b/src/plat/win32/win32Init.h index 6579e25..c0f1ffe 100644 --- a/src/plat/win32/win32Init.h +++ b/src/plat/win32/win32Init.h @@ -26,3 +26,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern App app; extern Dev dev; + diff --git a/src/system/atlas.h b/src/system/atlas.h index 4e9f922..005734f 100644 --- a/src/system/atlas.h +++ b/src/system/atlas.h @@ -21,6 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #include "../json/cJSON.h" -extern char *readFile(const char *filename); extern unsigned long hashcode(const char *str); +extern char *readFile(const char *filename); diff --git a/src/system/controls.h b/src/system/controls.h index 321c2dc..f74e302 100644 --- a/src/system/controls.h +++ b/src/system/controls.h @@ -23,3 +23,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define AXIS_MAX 32767 extern App app; + diff --git a/src/system/draw.h b/src/system/draw.h index ea42b66..91661cd 100644 --- a/src/system/draw.h +++ b/src/system/draw.h @@ -25,3 +25,4 @@ extern void drawText(int x, int y, int size, int align, SDL_Color c, const char extern App app; extern Colors colors; extern Dev dev; + diff --git a/src/system/i18n.h b/src/system/i18n.h index d73d04f..e375cf9 100644 --- a/src/system/i18n.h +++ b/src/system/i18n.h @@ -23,8 +23,8 @@ Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. #include #endif -#define TABLE_SIZE 255 - char *getTranslatedString(char *); void setLanguage(char *, char *); void cleanupLanguage(void); +#define TABLE_SIZE 255 + diff --git a/src/system/init.h b/src/system/init.h index cab81a8..ced614a 100644 --- a/src/system/init.h +++ b/src/system/init.h @@ -28,30 +28,31 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "locale.h" extern void createSaveFolder(void); -extern void setLanguage(char *applicationName, char *languageCode); -extern void initBackground(void); -extern void initGraphics(void); -extern void initFonts(void); -extern void initAtlas(void); -extern void initSounds(void); -extern void initSprites(void); -extern void initWidgets(void); -extern void initTrophies(void); -extern void initGame(void); -extern void initStats(void); -extern void initEntityFactory(void); -extern void destroyLookups(void); extern void destroyFonts(void); +extern void destroyGame(void); +extern void destroyLookups(void); extern void destroyTextures(void); extern void expireTexts(int all); -extern void destroyGame(void); extern int fileExists(const char *filename); -extern char *getSaveFilePath(const char *filename); -extern char *readFile(const char *filename); -extern long lookup(const char *name); -extern int writeFile(const char *filename, const char *data); extern char *getLookupName(const char *prefix, long num); +extern char *getSaveFilePath(const char *filename); +extern void initAtlas(void); +extern void initBackground(void); +extern void initEntityFactory(void); +extern void initFonts(void); +extern void initGame(void); +extern void initGraphics(void); +extern void initSounds(void); +extern void initSprites(void); +extern void initStats(void); +extern void initTrophies(void); +extern void initWidgets(void); +extern long lookup(const char *name); extern void prepareScene(void); 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 App app; + diff --git a/src/system/input.h b/src/system/input.h index e775197..b8fccce 100644 --- a/src/system/input.h +++ b/src/system/input.h @@ -18,8 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define MOUSE_DRAG_THRESHOLD 4 - #include "../common.h" +#define MOUSE_DRAG_THRESHOLD 4 + extern App app; + diff --git a/src/system/io.h b/src/system/io.h index 9091925..c8f0e84 100644 --- a/src/system/io.h +++ b/src/system/io.h @@ -25,3 +25,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include extern App app; + diff --git a/src/system/sound.h b/src/system/sound.h index 763b65e..ada30e7 100644 --- a/src/system/sound.h +++ b/src/system/sound.h @@ -22,11 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "SDL2/SDL_mixer.h" -#define MIN_BATTLE_SOUND_DISTANCE (MAP_TILE_SIZE * 8) #define MAX_BATTLE_SOUND_DISTANCE (SCREEN_WIDTH * 2) +#define MIN_BATTLE_SOUND_DISTANCE (MAP_TILE_SIZE * 8) -extern char *getFileLocation(char *filename); -extern int getDistance(int x1, int y1, int x2, int y2); extern float getAngle(int x1, int y1, int x2, int y2); +extern int getDistance(int x1, int y1, int x2, int y2); +extern char *getFileLocation(char *filename); extern World world; + diff --git a/src/system/sprites.h b/src/system/sprites.h index d56b7a1..1ef6528 100644 --- a/src/system/sprites.h +++ b/src/system/sprites.h @@ -21,7 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #include "../json/cJSON.h" -extern float wrap(float value, float low, float high); -extern char *readFile(const char *filename); extern char **getFileList(const char *dir, int *count); extern Atlas *getImageFromAtlas(char *filename); +extern char *readFile(const char *filename); +extern float wrap(float value, float low, float high); + diff --git a/src/system/text.h b/src/system/text.h index 663a84d..7ca35c3 100644 --- a/src/system/text.h +++ b/src/system/text.h @@ -28,3 +28,4 @@ extern unsigned long hashcode(const char *str); extern App app; extern Colors colors; + diff --git a/src/system/textures.h b/src/system/textures.h index 4cbb518..78af6d5 100644 --- a/src/system/textures.h +++ b/src/system/textures.h @@ -26,3 +26,4 @@ extern char *getFileLocation(const char *filename); extern unsigned long hashcode(const char *str); extern App app; + diff --git a/src/system/transition.h b/src/system/transition.h index b79f912..9c82a85 100644 --- a/src/system/transition.h +++ b/src/system/transition.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern void prepareScene(void); -extern void presentScene(void); extern void clearInput(void); extern void expireTexts(int all); +extern void prepareScene(void); +extern void presentScene(void); diff --git a/src/system/widgets.h b/src/system/widgets.h index 23f3672..9907263 100644 --- a/src/system/widgets.h +++ b/src/system/widgets.h @@ -21,20 +21,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #include "../json/cJSON.h" -extern char *readFile(const char *filename); -extern char **getFileList(const char *dir, int *count); -extern long lookup(const char *name); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern float limit(float i, float a, float b); -extern void playSound(int snd, int ch); -extern int isControl(int type); extern void clearControl(int type); extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); -extern Texture *getTexture(const char *filename); +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 c, const char *format, ...); +extern char **getFileList(const char *dir, int *count); extern Atlas *getImageFromAtlas(char *filename); +extern Texture *getTexture(const char *filename); +extern int isControl(int type); +extern float limit(float i, float a, float b); +extern long lookup(const char *name); +extern void playSound(int snd, int ch); +extern char *readFile(const char *filename); extern void textSize(const char *text, int size, int *w, int *h); extern App app; extern Colors colors; + diff --git a/src/test/atlasTest.h b/src/test/atlasTest.h index c3005f9..73c6dd2 100644 --- a/src/test/atlasTest.h +++ b/src/test/atlasTest.h @@ -20,12 +20,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern void initWorld(void); +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 void initOptions(void); -extern void createScreenshotFolder(void); extern Dev dev; extern Game game; + diff --git a/src/world/camera.h b/src/world/camera.h index 4cb59aa..e3c95bd 100644 --- a/src/world/camera.h +++ b/src/world/camera.h @@ -24,3 +24,4 @@ extern float limit(float i, float a, float b); extern Camera camera; extern World world; + diff --git a/src/world/effects.h b/src/world/effects.h index 67978fa..4e6f535 100644 --- a/src/world/effects.h +++ b/src/world/effects.h @@ -20,9 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern int rrnd(int low, int high); extern Sprite *getSprite(char *name); -extern void initFleshChunk(Decoration *d); extern void initDebris(Decoration *d); +extern void initFleshChunk(Decoration *d); +extern int rrnd(int low, int high); extern App app; + diff --git a/src/world/entities.h b/src/world/entities.h index dda12dc..2783859 100644 --- a/src/world/entities.h +++ b/src/world/entities.h @@ -23,24 +23,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_RIDERS 256 #define MAX_TOUCHED 256 -extern Texture *getTexture(const char *filename); -extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); -extern void addTeleportStars(Entity *e); -extern void removeFromQuadtree(Entity *e, Quadtree *root); -extern Sprite *getSprite(char *name); 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); +extern void addTeleportStars(Entity *e); extern void addToQuadtree(Entity *e, Quadtree *root); -extern float limit(float i, float a, float b); -extern int isWalkable(int x, int y); +extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); +extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); +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 Sprite *getSprite(char *name); +extern Texture *getTexture(const char *filename); extern int isLiquid(int x, int y); extern int isSolid(int x, int y); -extern void terminateJetpack(void); -extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore); +extern int isWalkable(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 Camera camera; extern Dev dev; extern Entity *self; -extern Camera camera; extern World world; + diff --git a/src/world/hud.h b/src/world/hud.h index fb38ed5..927e9a5 100644 --- a/src/world/hud.h +++ b/src/world/hud.h @@ -20,21 +20,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); const char *getWeaponName(int i); -extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void limitTextWidth(int width); -extern int getWrappedTextHeight(const char *text, int size); -extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); -extern Texture *getTexture(const char *filename); -extern SDL_Rect *getCurrentFrame(Sprite *s); -extern int getPercent(float current, float total); -extern Atlas *getImageFromAtlas(char *filename); + 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 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 c, const char *format, ...); +extern SDL_Rect *getCurrentFrame(Sprite *s); +extern Atlas *getImageFromAtlas(char *filename); +extern int getPercent(float current, float total); +extern Texture *getTexture(const char *filename); +extern int getWrappedTextHeight(const char *text, int size); +extern void limitTextWidth(int width); extern App app; -extern Dev dev; extern Camera camera; extern Colors colors; +extern Dev dev; extern World world; + diff --git a/src/world/items.h b/src/world/items.h index 2771040..e0a59c6 100644 --- a/src/world/items.h +++ b/src/world/items.h @@ -20,11 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern int rrnd(int low, int high); +extern Item * initWeaponPickup(void); extern int getRandomPlayerWeapon(int excludeGrenades); extern Sprite *getSprite(char *name); extern Item *initBattery(void); extern Item *initCherry(void); -extern Item * initWeaponPickup(void); +extern int rrnd(int low, int high); extern World world; + diff --git a/src/world/map.h b/src/world/map.h index 9fe3140..e4a4a02 100644 --- a/src/world/map.h +++ b/src/world/map.h @@ -20,12 +20,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern float limit(float i, float a, float b); -extern int rrnd(int low, int high); -extern char *readCompressedFile(const char *filename); +extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); extern Atlas *getImageFromAtlas(char *filename); extern Texture *getTexture(const char *filename); -extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); +extern float limit(float i, float a, float b); +extern char *readCompressedFile(const char *filename); +extern int rrnd(int low, int high); extern Camera camera; extern World world; + diff --git a/src/world/objectives.h b/src/world/objectives.h index 15b4a04..665d2cd 100644 --- a/src/world/objectives.h +++ b/src/world/objectives.h @@ -25,3 +25,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern void setGameplayMessage(int type, char *format, ...); extern World world; + diff --git a/src/world/particles.h b/src/world/particles.h index 6a89720..4620983 100644 --- a/src/world/particles.h +++ b/src/world/particles.h @@ -20,14 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern Sprite *getSprite(char *name); -extern int rrnd(int low, int high); -extern double randF(void); -extern int getDistance(int x1, int y1, int x2, int y2); -extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void drawLine(int x1, int y1, int x2, int y2, int r, int g, int b, int a); extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); +extern void drawLine(int x1, int y1, int x2, int y2, 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 int getDistance(int x1, int y1, int x2, int y2); +extern Sprite *getSprite(char *name); extern Texture *getTexture(const char *filename); +extern double randF(void); +extern int rrnd(int low, int high); extern Camera camera; extern World world; + diff --git a/src/world/player.h b/src/world/player.h index 19e4ea4..615d93d 100644 --- a/src/world/player.h +++ b/src/world/player.h @@ -20,9 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern void quitMission(void); extern void autoCompleteMission(void); +extern void quitMission(void); extern App app; extern Dev dev; extern World world; + diff --git a/src/world/quadtree.h b/src/world/quadtree.h index d603c61..a921dd8 100644 --- a/src/world/quadtree.h +++ b/src/world/quadtree.h @@ -20,9 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -#define QT_MAX_DEPTH 5 #define QT_INITIAL_CAPACITY 8 +#define QT_MAX_DEPTH 5 extern void *resize(void *array, int oldSize, int newSize); extern World world; + diff --git a/src/world/radar.h b/src/world/radar.h index 2d5a581..41631e2 100644 --- a/src/world/radar.h +++ b/src/world/radar.h @@ -20,14 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -#define RADAR_TILE_SIZE 16 -#define VIEW_SIZE_X 50 -#define VIEW_SIZE_Y 30 -#define OFFSET_X ((SCREEN_WIDTH - (RADAR_TILE_SIZE * VIEW_SIZE_X)) / 2) -#define OFFSET_Y ((SCREEN_HEIGHT - (RADAR_TILE_SIZE * VIEW_SIZE_Y)) / 2) -#define MAX_MARKERS 12 -#define MAX_BLIPS 32 - enum { M_MIA, @@ -36,22 +28,31 @@ enum M_MAX }; -extern int isWithinMap(int x, int y); -extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern float limit(float i, float low, float high); -extern Texture *getTexture(const char *filename); -extern Atlas *getImageFromAtlas(char *filename); -extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); -extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); +#define MAX_BLIPS 32 +#define MAX_MARKERS 12 +#define OFFSET_X ((SCREEN_WIDTH - (RADAR_TILE_SIZE * VIEW_SIZE_X)) / 2) +#define OFFSET_Y ((SCREEN_HEIGHT - (RADAR_TILE_SIZE * VIEW_SIZE_Y)) / 2) +#define RADAR_TILE_SIZE 16 +#define VIEW_SIZE_X 50 +#define VIEW_SIZE_Y 30 + extern void blitRectRotated(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, float angle); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void exitRadar(void); -extern int isControl(int type); +extern void blitRectScaled(SDL_Texture *texture, int x, int y, int w, int h, SDL_Rect *srcRect, int center); extern void clearControl(int type); -extern void startSectionTransition(void); +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 c, const char *format, ...); extern void endSectionTransition(void); +extern void exitRadar(void); +extern Atlas *getImageFromAtlas(char *filename); +extern Texture *getTexture(const char *filename); +extern int isControl(int type); +extern int isWithinMap(int x, int y); +extern float limit(float i, float low, float high); extern void pauseSound(int pause); +extern void startSectionTransition(void); extern App app; extern Colors colors; extern World world; + diff --git a/src/world/triggers.h b/src/world/triggers.h index abf3ff4..469d395 100644 --- a/src/world/triggers.h +++ b/src/world/triggers.h @@ -20,8 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); extern void activateEntities(char *names, int activate); +extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); extern void setGameplayMessage(int type, char *format, ...); extern World world; + diff --git a/src/world/world.h b/src/world/world.h index cecd208..61de445 100644 --- a/src/world/world.h +++ b/src/world/world.h @@ -29,90 +29,90 @@ enum SHOW_QUIT }; -extern Texture *getTexture(const char *filename); -extern void initObjectives(void); -extern Entity *getRandomObjectiveEntity(void); -extern void doBob(void); -extern void doLocationTriggers(void); -extern void dropCarriedItems(void); -extern void playSound(int snd, int ch); -extern void initEnding(void); -extern float cameraChase(Entity *e, int maxSpeed); -extern int rrnd(int low, int high); -extern void hideAllWidgets(void); -extern void resetAtCheckpoint(void); -extern void cameraTrack(Entity *e); -extern void stopMusic(void); -extern void animateSprites(void); -extern void addTeleportStars(Entity *e); -extern double randF(void); -extern int isSolid(int x, int y); -extern int isLiquid(int x, int y); -extern int isWalkable(int x, int y); -extern void doEntities(void); -extern void doEntitiesStatic(void); -extern void doParticles(void); -extern void doHud(void); -extern Entity *createEntity(char *typeStr); -extern void dropRandomCherry(int x, int y); +extern void addKeysFromStash(void); extern void addRandomWeapon(int x, int y); -extern void drawEntities(int plane); -extern void drawMap(void); +extern void addTeleportStars(Entity *e); +extern void animateSprites(void); +extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); extern void blitScaled(SDL_Texture *texture, int x, int y, int w, int h, int center); -extern void clearScreen(void); -extern void drawHud(void); -extern void initHud(void); -extern void initWeapons(void); -extern void initQuadtree(Quadtree *root); -extern void initParticles(void); -extern void initEffects(void); -extern void drawParticles(int plane); -extern void initItems(void); -extern void doPlayer(void); -extern int isOnScreen(Entity *e); -extern int isControl(int type); +extern float cameraChase(Entity *e, int maxSpeed); +extern void cameraTrack(Entity *e); extern void clearControl(int type); -extern void drawMissionStatus(void); -extern int isAcceptControl(void); extern void clearControls(void); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void loadMusic(char *filename); -extern void playMusic(int loop); -extern void initRadar(void); -extern void startSectionTransition(void); -extern void endSectionTransition(void); -extern void drawWidgets(void); -extern void showWidgetGroup(char *group); -extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); -extern void doWidgets(void); -extern Widget *getWidget(char *name, char *group); -extern void destroyTriggers(void); -extern void destroyObjectives(void); +extern void clearScreen(void); +extern Entity *createEntity(char *typeStr); extern void destroyEntities(void); +extern void destroyObjectives(void); extern void destroyParticles(void); extern void destroyQuadtree(void); -extern void loadWorld(char *id); -extern void initMap(void); -extern void initEntities(void); -extern void initPostMission(void); -extern void addKeysFromStash(void); -extern void drawStats(void); +extern void destroyTriggers(void); +extern void doBob(void); +extern void doEntities(void); +extern void doEntitiesStatic(void); +extern void doHud(void); +extern void doLocationTriggers(void); +extern void doParticles(void); +extern void doPlayer(void); extern void doStats(void); extern void doTrophies(void); +extern void doWidgets(void); +extern void drawEntities(int plane); +extern void drawHud(void); +extern void drawMap(void); +extern void drawMissionStatus(void); +extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a); +extern void drawParticles(int plane); +extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a); +extern void drawStats(void); +extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); extern void drawTrophies(void); -extern void limitTextWidth(int width); -extern void initOptions(void (*callback)(void)); -extern int getMissionStatus(char *id); -extern void blitRect(SDL_Texture *texture, int x, int y, SDL_Rect *srcRect, int center); -extern Atlas *getImageFromAtlas(char *filename); extern void drawWidgetFrame(void); +extern void drawWidgets(void); +extern void dropCarriedItems(void); +extern void dropRandomCherry(int x, int y); +extern void endSectionTransition(void); +extern int getDistance(int x1, int y1, int x2, int y2); +extern Atlas *getImageFromAtlas(char *filename); +extern int getMissionStatus(char *id); +extern Entity *getRandomObjectiveEntity(void); +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); +extern void initMap(void); +extern void initObjectives(void); +extern void initOptions(void (*callback)(void)); +extern void initParticles(void); +extern void initPostMission(void); +extern void initQuadtree(Quadtree *root); +extern void initRadar(void); +extern void initWeapons(void); +extern int isAcceptControl(void); +extern int isControl(int type); +extern int isLiquid(int x, int y); +extern int isOnScreen(Entity *e); +extern int isSolid(int x, int y); +extern int isWalkable(int x, int y); +extern void limitTextWidth(int width); +extern void loadMusic(char *filename); +extern void loadWorld(char *id); +extern void pauseSound(int pause); +extern void playBattleSound(int snd, int ch, int x, int y); +extern void playMusic(int loop); +extern void playSound(int snd, int ch); +extern double randF(void); +extern void resetAtCheckpoint(void); extern void retryMission(void); extern void returnToHub(void); extern void returnToTitle(void); -extern void playBattleSound(int snd, int ch, int x, int y); -extern void pauseSound(int pause); -extern int getDistance(int x1, int y1, int x2, int y2); +extern int rrnd(int low, int high); +extern void showWidgetGroup(char *group); +extern void startSectionTransition(void); +extern void stopMusic(void); extern App app; extern Colors colors; @@ -120,3 +120,4 @@ extern Dev dev; extern Entity *self; extern Game game; extern World world; + diff --git a/src/world/worldLoader.h b/src/world/worldLoader.h index e23a9bd..682a7d6 100644 --- a/src/world/worldLoader.h +++ b/src/world/worldLoader.h @@ -21,11 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #include "../json/cJSON.h" -extern char *readFile(const char *filename); extern Entity *createEntity(char *typeStr); extern int fileExists(const char *filename); +extern char *readFile(const char *filename); extern App app; extern Dev dev; extern Entity *self; extern World world; + diff --git a/src/world/worldSaver.h b/src/world/worldSaver.h index 9c4203f..7f2d881 100644 --- a/src/world/worldSaver.h +++ b/src/world/worldSaver.h @@ -26,3 +26,4 @@ extern int writeFile(const char *filename, const char *data); extern App app; extern Entity *self; extern World world; +