diff --git a/src/battle/ai.h b/src/battle/ai.h index def5453..9380e0c 100644 --- a/src/battle/ai.h +++ b/src/battle/ai.h @@ -23,26 +23,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define AI_EVADE 0 #define AI_FALLBACK 1 #define AI_HUNT 2 - #define TURN_SPEED 4 #define TURN_THRESHOLD 2 -extern float mod(float n, float x); -extern int getDistance(int x1, int y1, int x2, int y2); +extern void addHudMessage(SDL_Color c, char *format, ...); +extern void applyFighterBrakes(void); +extern void applyFighterThrust(void); extern void fireGuns(Entity *owner); extern void fireMissile(Entity *owner); extern void fireRocket(Entity *owner); -extern float getAngle(int x1, int y1, int x2, int y2); -extern void applyFighterThrust(void); -extern void applyFighterBrakes(void); -extern void addHudMessage(SDL_Color c, char *format, ...); extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); -extern char *getTranslatedString(char *string); -extern Entity *spawnMine(int type); +extern float getAngle(int x1, int y1, int x2, int y2); +extern int getDistance(int x1, int y1, int x2, int y2); +extern float mod(float n, float x); extern void runScriptFunction(char *format, ...); +extern Entity *spawnMine(int type); extern Battle battle; extern Colors colors; extern Dev dev; -extern Entity *self; extern Entity *player; +extern Entity *self; diff --git a/src/battle/battle.h b/src/battle/battle.h index cd45a19..9d333ca 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -27,70 +27,69 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SHOW_OBJECTIVES 2 #define SHOW_OPTIONS 3 -extern void doBullets(void); -extern void drawBullets(void); -extern void doStars(float dx, float dy); -extern void drawStars(void); -extern void doEntities(void); -extern void drawEntities(void); -extern void initStars(void); -extern void doPlayer(void); -extern void drawHud(void); -extern void drawEffects(void); -extern void doEffects(void); -extern void doObjectives(void); -extern void doChallenges(void); -extern void blitScaled(AtlasImage *atlasImage, int x, int y, int w, int h, int center); -extern void initHud(void); -extern void initRadar(void); -extern void initGalacticMap(void); -extern void initEntities(void); -extern void destroyEntities(void); -extern void drawWidgets(char *groupName); -extern void selectWidget(const char *name, const char *group); -extern Widget *getWidget(const char *name, const char *group); -extern void doWidgets(void); -extern void loadMission(char *filename); -extern void resetHud(void); -extern void doHud(void); -extern void drawMissionInfo(void); -extern void drawBackground(SDL_Texture *texture); -extern void initBackground(void); -extern void scrollBackground(float x, float y); -extern void initOptions(void (*returnFromOptions)(void)); -extern void drawOptions(void); -extern void playSound(int id); -extern void resetWaypoints(void); -extern void doPlayerSelect(void); -extern void destroyQuadtree(void); -extern void initQuadtree(Quadtree *root); -extern void initEffects(void); -extern void doScript(void); -extern void destroyScript(void); -extern void initMessageBox(void); -extern void doMessageBox(void); -extern void drawMessageBox(void); -extern void resetMessageBox(void); -extern void initBullets(void); -extern void initDebris(void); -extern void doDebris(void); -extern void drawDebris(void); -extern void doLocations(void); -extern void drawLocations(void); -extern void destroyDebris(void); -extern void destroyBullets(void); -extern void destroyEffects(void); -extern void initChallengeHome(void); -extern void updateAccuracyStats(unsigned int *stats); -extern void clearInput(void); -extern void runScriptFunction(const char *format, ...); -extern void doSpawners(void); -extern void cancelScript(void); extern void awardTrophy(char *id); +extern void blitScaled(AtlasImage *atlasImage, int x, int y, int w, int h, int center); +extern void cancelScript(void); +extern void clearInput(void); +extern void destroyBullets(void); +extern void destroyDebris(void); +extern void destroyEffects(void); +extern void destroyEntities(void); +extern void destroyQuadtree(void); +extern void destroyScript(void); +extern void doBullets(void); +extern void doChallenges(void); +extern void doDebris(void); +extern void doEffects(void); +extern void doEntities(void); +extern void doHud(void); +extern void doLocations(void); +extern void doMessageBox(void); +extern void doObjectives(void); +extern void doPlayer(void); +extern void doPlayerSelect(void); +extern void doScript(void); +extern void doSpawners(void); +extern void doStars(float dx, float dy); +extern void doWidgets(void); +extern void drawBackground(SDL_Texture *texture); +extern void drawBullets(void); +extern void drawDebris(void); +extern void drawEffects(void); +extern void drawEntities(void); +extern void drawHud(void); +extern void drawLocations(void); +extern void drawMessageBox(void); +extern void drawMissionInfo(void); +extern void drawOptions(void); +extern void drawStars(void); +extern void drawWidgets(char *groupName); +extern Widget *getWidget(const char *name, const char *group); +extern void initBackground(void); +extern void initBullets(void); +extern void initChallengeHome(void); extern void initCredits(void); -extern void showOKCancelDialog(void (*okCallback)(void), void (*cancelCallback)(void), const char *format, ...); -extern char *getTranslatedString(char *string); +extern void initDebris(void); +extern void initEffects(void); +extern void initEntities(void); +extern void initGalacticMap(void); +extern void initHud(void); +extern void initMessageBox(void); +extern void initOptions(void (*returnFromOptions)(void)); +extern void initQuadtree(Quadtree *root); +extern void initRadar(void); +extern void initStars(void); +extern void loadMission(char *filename); +extern void playSound(int id); +extern void resetHud(void); +extern void resetMessageBox(void); +extern void resetWaypoints(void); +extern void runScriptFunction(const char *format, ...); +extern void scrollBackground(float x, float y); +extern void selectWidget(const char *name, const char *group); extern void setAtlasColor(int r, int g, int b, int a); +extern void showOKCancelDialog(void (*okCallback)(void), void (*cancelCallback)(void), const char *format, ...); +extern void updateAccuracyStats(unsigned int *stats); extern App app; extern Battle battle; diff --git a/src/battle/bullets.h b/src/battle/bullets.h index 82ffd1e..43d2d33 100644 --- a/src/battle/bullets.h +++ b/src/battle/bullets.h @@ -22,36 +22,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" +#define INITIAL_BULLET_DRAW_CAPACITY 32 +#define MISSILE_LIFE (FPS * 30) #define TURN_SPEED 2 #define TURN_THRESHOLD 3 -#define INITIAL_BULLET_DRAW_CAPACITY 32 -#define MISSILE_LIFE (FPS * 30) - -extern AtlasImage *getAtlasImage(char *filename); +extern void addBulletHitEffect(int x, int y, int r, int g, int b); +extern void addMissileEngineEffect(Bullet *b); +extern void addMissileExplosion(Bullet *b); +extern void awardTrophy(char *id); extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); extern void damageFighter(Entity *e, int damage, long flags); -extern void playBattleSound(int id, int x, int y); extern long flagsToLong(char *flags, int *add); -extern long lookup(char *name); -extern char *readFile(char *filename); -extern float getAngle(int x1, int y1, int x2, int y2); -extern void addMissileEngineEffect(Bullet *b); -extern float mod(float n, float x); -extern void addMissileExplosion(Bullet *b); -extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore); extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void playSound(int id); -extern char *getTranslatedString(char *string); -extern void *resize(void *array, int oldSize, int newSize); -extern void awardTrophy(char *id); -extern int isOnBattleScreen(int x, int y, int w, int h); +extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore); +extern float getAngle(int x1, int y1, int x2, int y2); +extern AtlasImage *getAtlasImage(char *filename); extern int getDistance(int x1, int y1, int x2, int y2); -extern void addBulletHitEffect(int x, int y, int r, int g, int b); +extern int isOnBattleScreen(int x, int y, int w, int h); +extern long lookup(char *name); +extern float mod(float n, float x); +extern void playBattleSound(int id, int x, int y); +extern void playSound(int id); +extern char *readFile(char *filename); +extern void *resize(void *array, int oldSize, int newSize); extern App app; extern Battle battle; -extern Colors colors; extern Entity *player; diff --git a/src/battle/capitalShips.h b/src/battle/capitalShips.h index 009162a..3527d16 100644 --- a/src/battle/capitalShips.h +++ b/src/battle/capitalShips.h @@ -18,38 +18,38 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define TURN_SPEED 0.1 -#define TURN_THRESHOLD 2 #include "../common.h" #include "../json/cJSON.h" -extern Entity *spawnEntity(void); +#define TURN_SPEED 0.1 +#define TURN_THRESHOLD 2 + +extern void addDebris(int x, int y, int amount); +extern void addLargeEngineEffect(void); +extern void addLargeExplosion(void); +extern void addMessageBox(char *title, char *body, int type); extern void addSmallExplosion(void); -extern void playBattleSound(int id, int x, int y); +extern void applyFighterThrust(void); +extern void doAI(void); +extern long flagsToLong(char *flags, int *add); +extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); extern float getAngle(int x1, int y1, int x2, int y2); extern AtlasImage *getAtlasImage(char *filename); -extern char *readFile(char *filename); -extern long flagsToLong(char *flags, int *add); -extern long lookup(char *name); -extern void doAI(void); -extern void applyFighterThrust(void); -extern void addLargeEngineEffect(void); extern int getDistance(int x1, int y1, int x2, int y2); -extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); -extern void addDebris(int x, int y, int amount); -extern void runScriptFunction(char *format, ...); -extern void updateObjective(char *name, int type); extern char **getFileList(char *dir, int *count); extern int getJSONValue(cJSON *node, char *name, int defValue); extern char *getJSONValueStr(cJSON *node, char *name, char *defValue); -extern char *getTranslatedString(char *string); -extern void addLargeExplosion(void); +extern long lookup(char *name); +extern float mod(float n, float x); +extern void playBattleSound(int id, int x, int y); +extern char *readFile(char *filename); +extern void runScriptFunction(char *format, ...); +extern Entity *spawnEntity(void); extern char **toTypeArray(char *types, int *numTypes); extern void updateCondition(char *name, int type); -extern void addMessageBox(char *title, char *body, int type); -extern float mod(float n, float x); +extern void updateObjective(char *name, int type); extern Battle battle; extern Entity *player; diff --git a/src/battle/debris.h b/src/battle/debris.h index a3f9c0b..b0fe4fd 100644 --- a/src/battle/debris.h +++ b/src/battle/debris.h @@ -25,11 +25,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define INITIAL_DEBRIS_DRAW_CAPACITY 32 #define MAX_DEBRIS_TEXTURES 6 -extern float mod(float n, float x); +extern void addDebrisFire(int x, int y); extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); extern AtlasImage *getAtlasImage(char *filename); -extern void addDebrisFire(int x, int y); -extern void *resize(void *array, int oldSize, int newSize); extern int isOnBattleScreen(int x, int y, int w, int h); +extern float mod(float n, float x); +extern void *resize(void *array, int oldSize, int newSize); extern Battle battle; diff --git a/src/battle/effects.h b/src/battle/effects.h index b55995e..32444f3 100644 --- a/src/battle/effects.h +++ b/src/battle/effects.h @@ -23,10 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define INITIAL_EFFECT_DRAW_CAPACITY 128 extern void blitScaled(AtlasImage *atlasImage, int x, int y, int w, int h, int center); -extern AtlasImage *getAtlasImage(char *name); extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); -extern void *resize(void *array, int oldSize, int newSize); +extern AtlasImage *getAtlasImage(char *name); extern int isOnBattleScreen(int x, int y, int w, int h); +extern void *resize(void *array, int oldSize, int newSize); extern void setAtlasColor(int r, int g, int b, int a); extern App app; diff --git a/src/battle/entities.h b/src/battle/entities.h index 6f9d4e5..35e1511 100644 --- a/src/battle/entities.h +++ b/src/battle/entities.h @@ -20,29 +20,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -#define DISABLED_GLOW_SPEED 3 -#define DISABLED_GLOW_MIN 128 #define DISABLED_GLOW_MAX 255 +#define DISABLED_GLOW_MIN 128 +#define DISABLED_GLOW_SPEED 3 +extern void addToQuadtree(Entity *e, Quadtree *root); +extern void awardTrophy(char *id); extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); -extern void doFighter(void); +extern void cutRope(Entity *e); extern void doCapitalShip(void); +extern void doFighter(void); extern void doRope(Entity *e); extern void drawRope(Entity *e); -extern void cutRope(Entity *e); extern void drawShieldHitEffect(Entity *e); -extern void removeFromQuadtree(Entity *e, Quadtree *root); -extern void addToQuadtree(Entity *e, Quadtree *root); -extern void updateCapitalShipComponentProperties(Entity *parent, long flags); extern Entity **getAllEntsWithin(int x, int y, int w, int h, Entity *ignore); extern int isOnBattleScreen(int x, int y, int w, int h); extern long lookup(char *name); -extern void awardTrophy(char *id); +extern void removeFromQuadtree(Entity *e, Quadtree *root); extern void resetFighter(Entity *e); extern void setAtlasColor(int r, int g, int b, int a); +extern void updateCapitalShipComponentProperties(Entity *parent, long flags); extern App app; extern Battle battle; extern Dev dev; -extern Entity *self; extern Entity *player; +extern Entity *self; diff --git a/src/battle/fighters.h b/src/battle/fighters.h index 2e429c0..7254ceb 100644 --- a/src/battle/fighters.h +++ b/src/battle/fighters.h @@ -22,36 +22,35 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" -extern AtlasImage *getAtlasImage(char *filename); -extern void doAI(void); -extern float getAngle(int x1, int y1, int x2, int y2); -extern int getDistance(int x1, int y1, int x2, int y2); +extern void addDebris(int x, int y, int amount); extern void addEngineEffect(void); +extern void addHudMessage(SDL_Color c, char *format, ...); +extern void addRandomItem(int x, int y); +extern void addShieldSplinterEffect(Entity *ent); extern void addSmallExplosion(void); extern void addSmallFighterExplosion(void); -extern void playBattleSound(int id, int x, int y); -extern void updateObjective(char *name, int type); -extern void updateCondition(char *name, int type); -extern void addHudMessage(SDL_Color c, char *format, ...); -extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); -extern Entity *spawnEntity(void); extern void adjustObjectiveTargetValue(char *name, int type, int amount); extern void attachRope(void); -extern char *readFile(char *filename); -extern long lookup(char *name); -extern long flagsToLong(char *flags, int *add); -extern void addShieldSplinterEffect(Entity *ent); -extern void completeMission(void); -extern void runScriptFunction(char *format, ...); -extern void addDebris(int x, int y, int amount); -extern char **getFileList(char *dir, int *count); -extern char *getTranslatedString(char *string); -extern int getJSONValue(cJSON *node, char *name, int defValue); -extern char **toTypeArray(char *types, int *numTypes); -extern char *getJSONValueStr(cJSON *node, char *name, char *defValue); -extern void addRandomItem(int x, int y); extern void checkSuspicionLevel(void); extern void checkZackariaSuspicionLevel(void); +extern void completeMission(void); +extern void doAI(void); +extern long flagsToLong(char *flags, int *add); +extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); +extern float getAngle(int x1, int y1, int x2, int y2); +extern AtlasImage *getAtlasImage(char *filename); +extern int getDistance(int x1, int y1, int x2, int y2); +extern char **getFileList(char *dir, int *count); +extern int getJSONValue(cJSON *node, char *name, int defValue); +extern char *getJSONValueStr(cJSON *node, char *name, char *defValue); +extern long lookup(char *name); +extern void playBattleSound(int id, int x, int y); +extern char *readFile(char *filename); +extern void runScriptFunction(char *format, ...); +extern Entity *spawnEntity(void); +extern char **toTypeArray(char *types, int *numTypes); +extern void updateCondition(char *name, int type); +extern void updateObjective(char *name, int type); extern Battle battle; extern Colors colors; diff --git a/src/battle/hud.h b/src/battle/hud.h index facc704..cbfff4d 100644 --- a/src/battle/hud.h +++ b/src/battle/hud.h @@ -22,20 +22,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_HUD_MESSAGES 6 -extern AtlasImage *getAtlasImage(char *filename); -extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); extern void blit(AtlasImage *atlasImage, int x, int y, int center); -extern float getAngle(int x1, int y1, int x2, int y2); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern int getDistance(int x1, int y1, int x2, int y2); +extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); extern void drawRadar(void); extern void drawRadarRangeWarning(void); +extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); +extern float getAngle(int x1, int y1, int x2, int y2); +extern AtlasImage *getAtlasImage(char *filename); +extern int getDistance(int x1, int y1, int x2, int y2); extern int getPercent(float current, float total); -extern int playerHasGun(int type); -extern char *getTranslatedString(char *string); -extern char *timeToString(long millis, int showHours); extern int jumpgateEnabled(void); +extern int playerHasGun(int type); extern void setAtlasColor(int r, int g, int b, int a); +extern char *timeToString(long millis, int showHours); extern App app; extern Battle battle; diff --git a/src/battle/items.h b/src/battle/items.h index 21caac7..e4b3cf9 100644 --- a/src/battle/items.h +++ b/src/battle/items.h @@ -22,20 +22,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" -extern char *readFile(char *filename); -extern AtlasImage *getAtlasImage(char *filename); -extern Entity *spawnEntity(void); -extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); -extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); -extern void playBattleSound(int id, int x, int y); extern void addHudMessage(SDL_Color c, char *format, ...); -extern void updateObjective(char *name, int type); -extern char *getTranslatedString(char *string); +extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); +extern long flagsToLong(char *flags, int *add); +extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); +extern AtlasImage *getAtlasImage(char *filename); extern int getJSONValue(cJSON *node, char *name, int defValue); extern char *getJSONValueStr(cJSON *node, char *name, char *defValue); -extern long flagsToLong(char *flags, int *add); +extern void playBattleSound(int id, int x, int y); +extern char *readFile(char *filename); +extern Entity *spawnEntity(void); +extern void updateObjective(char *name, int type); extern Battle battle; -extern Entity *self; -extern Entity *player; extern Colors colors; +extern Entity *player; +extern Entity *self; diff --git a/src/battle/jumpgate.h b/src/battle/jumpgate.h index 085fd5f..c3c484f 100644 --- a/src/battle/jumpgate.h +++ b/src/battle/jumpgate.h @@ -22,18 +22,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ESCAPE_DISTANCE 256 -extern AtlasImage *getAtlasImage(char *filename); -extern Entity *spawnEntity(void); +extern void addDebris(int x, int y, int amount); +extern void addSmallExplosion(void); +extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); +extern AtlasImage *getAtlasImage(char *filename); extern int getDistance(int x1, int y1, int x2, int y2); extern void playBattleSound(int id, int x, int y); -extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); -extern char *getTranslatedString(char *string); -extern void addSmallExplosion(void); -extern void addDebris(int x, int y, int amount); extern void runScriptFunction(char *format, ...); -extern void updateObjective(char *name, int type); +extern Entity *spawnEntity(void); extern void updateCondition(char *name, int type); +extern void updateObjective(char *name, int type); extern Battle battle; extern Entity *self; diff --git a/src/battle/locations.h b/src/battle/locations.h index 5760420..372b22e 100644 --- a/src/battle/locations.h +++ b/src/battle/locations.h @@ -22,10 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" +extern void drawCircle(int cx, int cy, int radius, int r, int g, int b, int a); +extern int getDistance(int x1, int y1, int x2, int y2); +extern int getJSONValue(cJSON *node, char *name, int defValue); +extern void runScriptFunction(char *format, ...); + extern Battle battle; extern Entity *player; - -extern int getDistance(int x1, int y1, int x2, int y2); -extern void runScriptFunction(char *format, ...); -extern void drawCircle(int cx, int cy, int radius, int r, int g, int b, int a); -extern int getJSONValue(cJSON *node, char *name, int defValue); diff --git a/src/battle/messageBox.h b/src/battle/messageBox.h index f6df54c..ec9658a 100644 --- a/src/battle/messageBox.h +++ b/src/battle/messageBox.h @@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); extern int getWrappedTextHeight(char *text, int size); -extern void limitTextWidth(int width); extern void playSound(int sound); extern App app; diff --git a/src/battle/mine.h b/src/battle/mine.h index 9d767bf..7dc1f49 100644 --- a/src/battle/mine.h +++ b/src/battle/mine.h @@ -20,20 +20,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -#define TRIGGER_RANGE 150 #define DAMAGE_RANGE 250 #define SYSTEM_POWER 50 +#define TRIGGER_RANGE 150 -extern Entity *spawnEntity(void); -extern AtlasImage *getAtlasImage(char *filename); -extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); -extern int getDistance(int x1, int y1, int x2, int y2); extern void addMineExplosion(void); -extern void damageFighter(Entity *e, int amount, long flags); -extern void playBattleSound(int id, int x, int y); -extern void updateObjective(char *name, int type); -extern void runScriptFunction(const char *format, ...); extern void awardTrophy(char *id); +extern void damageFighter(Entity *e, int amount, long flags); +extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); +extern AtlasImage *getAtlasImage(char *filename); +extern int getDistance(int x1, int y1, int x2, int y2); +extern void playBattleSound(int id, int x, int y); +extern void runScriptFunction(const char *format, ...); +extern Entity *spawnEntity(void); +extern void updateObjective(char *name, int type); extern Battle battle; extern Entity *player; diff --git a/src/battle/missionInfo.h b/src/battle/missionInfo.h index 575421a..a443c84 100644 --- a/src/battle/missionInfo.h +++ b/src/battle/missionInfo.h @@ -22,10 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern void blit(AtlasImage *atlasImage, int x, int y, int center); extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); +extern void drawWidgets(char *groupName); extern AtlasImage *getAtlasImage(char *filename); extern char *getChallengeDescription(Challenge *c); -extern void drawWidgets(char *groupName); -extern char *getTranslatedString(char *string); extern char *timeToString(long millis, int showHours); extern App app; diff --git a/src/battle/objectives.h b/src/battle/objectives.h index 1e0295c..4df2de6 100644 --- a/src/battle/objectives.h +++ b/src/battle/objectives.h @@ -22,13 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" extern void addHudMessage(SDL_Color c, char *format, ...); -extern void runScriptFunction(char *format, ...); extern void completeMission(void); extern void failMission(void); -extern char *getTranslatedString(char *string); extern int getJSONValue(cJSON *node, char *name, int defValue); extern long lookup(char *name); extern void playSound(int id); +extern void runScriptFunction(char *format, ...); extern Battle battle; extern Colors colors; diff --git a/src/battle/player.h b/src/battle/player.h index c051704..923ecf3 100644 --- a/src/battle/player.h +++ b/src/battle/player.h @@ -24,28 +24,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_SELECTABLE_PLAYERS 8 #define MAX_SELECTABLE_TARGETS 8 +extern void addECMEffect(Entity *ent); +extern void addHudMessage(SDL_Color c, char *format, ...); +extern void applyFighterBrakes(void); +extern void applyFighterThrust(void); +extern void awardTrophy(char *id); +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 void failMission(void); extern void fireGuns(Entity *owner); extern void fireMissile(Entity *owner); extern void fireRocket(Entity *owner); -extern void applyFighterThrust(void); -extern void applyFighterBrakes(void); +extern long flagsToLong(char *flags, int *add); +extern float getAngle(int x1, int y1, int x2, int y2); extern int getDistance(int x1, int y1, int x2, int y2); -extern void addHudMessage(SDL_Color c, char *format, ...); +extern int isAcceptControl(void); +extern int isControl(int type); +extern long lookup(char *name); extern float mod(float n, float x); extern void playSound(int id); -extern void failMission(void); -extern float getAngle(int x1, int y1, int x2, int y2); -extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); -extern char *getTranslatedString(char *string); -extern void addECMEffect(Entity *ent); -extern int isControl(int type); -extern void clearControl(int type); -extern long lookup(char *name); -extern Entity *spawnFighter(char *name, int x, int y, int side); -extern int isAcceptControl(void); extern void resetAcceptControls(void); -extern void awardTrophy(char *id); -extern long flagsToLong(char *flags, int *add); +extern Entity *spawnFighter(char *name, int x, int y, int side); extern void updateCondition(char *name, int type); extern App app; diff --git a/src/battle/quadtree.h b/src/battle/quadtree.h index 7cec09b..33165d9 100644 --- a/src/battle/quadtree.h +++ b/src/battle/quadtree.h @@ -20,8 +20,8 @@ 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); diff --git a/src/battle/radar.h b/src/battle/radar.h index e50e9c8..1e5a528 100644 --- a/src/battle/radar.h +++ b/src/battle/radar.h @@ -20,12 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern int getDistance(int x1, int y1, int x2, int y2); extern void blit(AtlasImage *atlasImage, int x, int y, int center); -extern AtlasImage *getAtlasImage(char *filename); extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern char *getTranslatedString(char *string); +extern AtlasImage *getAtlasImage(char *filename); +extern int getDistance(int x1, int y1, int x2, int y2); extern App app; extern Battle battle; diff --git a/src/battle/rope.h b/src/battle/rope.h index 5933a93..1240bad 100644 --- a/src/battle/rope.h +++ b/src/battle/rope.h @@ -22,16 +22,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ROPE_DISTANCE 128 +extern void addHudMessage(SDL_Color c, char *format, ...); +extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); extern float getAngle(int x1, int y1, int x2, int y2); extern int getDistance(int x1, int y1, int x2, int y2); -extern Entity **getAllEntsInRadius(int x, int y, int radius, Entity *ignore); -extern void addHudMessage(SDL_Color c, char *format, ...); -extern void runScriptFunction(char *format, ...); -extern char *getTranslatedString(char *string); extern void playBattleSound(int id, int x, int y); +extern void runScriptFunction(char *format, ...); extern App app; extern Battle battle; extern Colors colors; -extern Entity *self; extern Entity *player; +extern Entity *self; diff --git a/src/battle/script.h b/src/battle/script.h index f015e38..b8c6ae6 100644 --- a/src/battle/script.h +++ b/src/battle/script.h @@ -22,26 +22,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" -extern void completeMission(void); -extern void failMission(void); -extern void retreatEnemies(void); -extern void retreatAllies(void); -extern void addHudMessage(SDL_Color c, char *format, ...); -extern void addMessageBox(char *title, char *body, int type); extern void activateEntities(char *name); extern void activateEntityGroups(char *groupName); -extern void activateLocations(char *locations); -extern void activateObjectives(char *objectives); -extern int showingMessageBoxes(void); -extern char *getTranslatedString(char *string); -extern void activateNextWaypoint(void); extern void activateJumpgate(int activate); +extern void activateLocations(char *locations); +extern void activateNextWaypoint(void); +extern void activateObjectives(char *objectives); extern void activateSpawner(char *name, int active); -extern void completeAllObjectives(void); -extern void createChristabelLocation(void); -extern void killEntity(char *name); -extern void updateEntitySide(char *side, char *entity); extern void activateTrespasserSpawner(void); +extern void addHudMessage(SDL_Color c, char *format, ...); +extern void addMessageBox(char *title, char *body, int type); +extern void completeAllObjectives(void); +extern void completeMission(void); +extern void createChristabelLocation(void); +extern void failMission(void); +extern void killEntity(char *name); +extern void retreatAllies(void); +extern void retreatEnemies(void); +extern int showingMessageBoxes(void); +extern void updateEntitySide(char *side, char *entity); extern Battle battle; extern Colors colors; diff --git a/src/battle/spawners.h b/src/battle/spawners.h index e2d9b96..5e64503 100644 --- a/src/battle/spawners.h +++ b/src/battle/spawners.h @@ -22,12 +22,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" +extern long flagsToLong(char *flags, int *add); +extern int getJSONValue(cJSON *node, char *name, int defValue); +extern char *getJSONValueStr(cJSON *node, char *name, char *defValue); extern long lookup(char *name); extern Entity *spawnFighter(char *name, int x, int y, int side); -extern int getJSONValue(cJSON *node, char *name, int defValue); extern char **toTypeArray(char *types, int *numTypes); -extern char *getJSONValueStr(cJSON *node, char *name, char *defValue); -extern long flagsToLong(char *flags, int *add); extern Battle battle; extern Entity *player; diff --git a/src/battle/waypoints.h b/src/battle/waypoints.h index 9f7865f..6fe8ab0 100644 --- a/src/battle/waypoints.h +++ b/src/battle/waypoints.h @@ -20,17 +20,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" +extern void addHudMessage(SDL_Color c, char *format, ...); extern AtlasImage *getAtlasImage(char *filename); extern int getDistance(int x1, int y1, int x2, int y2); -extern void addHudMessage(SDL_Color c, char *format, ...); +extern void playSound(int id); +extern void runScriptFunction(char *format, ...); extern Entity *spawnEntity(void); extern void updateObjective(char *name, int type); -extern void runScriptFunction(char *format, ...); -extern char *getTranslatedString(char *string); -extern void playSound(int id); extern Battle battle; extern Colors colors; -extern Entity *self; extern Entity *player; +extern Entity *self; extern Game game; diff --git a/src/challenges/challengeHome.h b/src/challenges/challengeHome.h index 7687489..defa920 100644 --- a/src/challenges/challengeHome.h +++ b/src/challenges/challengeHome.h @@ -21,55 +21,53 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #define CHALLENGES_PER_PAGE 14 - #define SHOW_CHALLENGES 0 +#define SHOW_FIGHTER_DB 5 #define SHOW_MENU 1 #define SHOW_OPTIONS 2 #define SHOW_STATS 3 #define SHOW_TROPHIES 4 -#define SHOW_FIGHTER_DB 5 -extern void startSectionTransition(void); -extern void endSectionTransition(void); -extern void stopMusic(void); -extern void initBattle(void); -extern void loadMission(char *filename); -extern void doStars(float dx, float dy); -extern void drawStars(void); -extern void doWidgets(void); -extern SDL_Texture *getTexture(char *filename); -extern AtlasImage *getAtlasImage(const char *filename); -extern void drawBackground(SDL_Texture *texture); -extern void initBackground(void); -extern void scrollBackground(float x, float y); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void drawWidgets(char *groupName); -extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); -extern Widget *getWidget(const char *name, const char *group); -extern void initTitle(void); -extern void initStatsDisplay(void); -extern void drawOptions(void); -extern void initOptions(void (*returnFromOptions)(void)); -extern void drawStats(void); -extern void playSound(int sound); -extern void selectWidget(const char *name, const char *group); -extern void updateAllMissions(void); -extern char *getTranslatedString(char *string); -extern void blit(AtlasImage *atlasImage, int x, int y, int centered); -extern char *getBackgroundTextureName(int n); -extern char *getPlanetTextureName(int n); -extern void playMusic(char *filename, int loop); -extern char *timeToString(long millis, int showHours); -extern char *getChallengeDescription(Challenge *c); -extern void clearInput(void); -extern void awardStatsTrophies(void); -extern void awardChallengeTrophies(void); -extern void initTrophiesDisplay(void); -extern void drawTrophies(void); -extern void doFighterDatabase(void); -extern void initFighterDatabaseDisplay(void); -extern void drawFighterDatabase(void); extern void autoSizeWidgetButtons(char *group, int recenter); +extern void awardChallengeTrophies(void); +extern void awardStatsTrophies(void); +extern void blit(AtlasImage *atlasImage, int x, int y, int centered); +extern void clearInput(void); +extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); +extern void doFighterDatabase(void); +extern void doStars(float dx, float dy); +extern void doWidgets(void); +extern void drawBackground(SDL_Texture *texture); +extern void drawFighterDatabase(void); +extern void drawOptions(void); +extern void drawStars(void); +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 drawWidgets(char *groupName); +extern void endSectionTransition(void); +extern AtlasImage *getAtlasImage(const char *filename); +extern char *getBackgroundTextureName(int n); +extern char *getChallengeDescription(Challenge *c); +extern char *getPlanetTextureName(int n); +extern SDL_Texture *getTexture(char *filename); +extern Widget *getWidget(const char *name, const char *group); +extern void initBackground(void); +extern void initBattle(void); +extern void initFighterDatabaseDisplay(void); +extern void initOptions(void (*returnFromOptions)(void)); +extern void initStatsDisplay(void); +extern void initTitle(void); +extern void initTrophiesDisplay(void); +extern void loadMission(char *filename); +extern void playMusic(char *filename, int loop); +extern void playSound(int sound); +extern void scrollBackground(float x, float y); +extern void selectWidget(const char *name, const char *group); +extern void startSectionTransition(void); +extern void stopMusic(void); +extern char *timeToString(long millis, int showHours); +extern void updateAllMissions(void); extern App app; extern Battle battle; diff --git a/src/challenges/challenges.h b/src/challenges/challenges.h index 362d264..8504699 100644 --- a/src/challenges/challenges.h +++ b/src/challenges/challenges.h @@ -21,21 +21,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" #include "../json/cJSON.h" -extern Mission *loadMissionMeta(char *filename); -extern char **getFileList(char *dir, int *count); -extern void selectWidget(const char *name, const char *group); -extern char *getTranslatedString(char *string); -extern char *getLookupName(char *prefix, long num); -extern char *timeToString(long millis, int showHours); -extern void updateAccuracyStats(unsigned int *stats); -extern int getJSONValue(cJSON *node, char *name, int defValue); -extern long lookup(char *name); +extern void awardCraftTrophy(void); extern void awardStatsTrophies(void); +extern char **getFileList(char *dir, int *count); +extern int getJSONValue(cJSON *node, char *name, int defValue); +extern char *getLookupName(char *prefix, long num); +extern Mission *loadMissionMeta(char *filename); +extern long lookup(char *name); extern void retreatAllies(void); extern void retreatEnemies(void); -extern void awardCraftTrophy(void); +extern void selectWidget(const char *name, const char *group); +extern char *timeToString(long millis, int showHours); +extern void updateAccuracyStats(unsigned int *stats); -extern Dev dev; extern Battle battle; +extern Dev dev; extern Entity *player; extern Game game; diff --git a/src/common.h b/src/common.h index 8b9a599..b473cd0 100644 --- a/src/common.h +++ b/src/common.h @@ -28,3 +28,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "defs.h" #include "structs.h" + +extern char *getTranslatedString(char *string); diff --git a/src/galaxy/galacticMap.h b/src/galaxy/galacticMap.h index 25cc881..ad585ec 100644 --- a/src/galaxy/galacticMap.h +++ b/src/galaxy/galacticMap.h @@ -20,60 +20,57 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" +#define MAX_LISTED_MISSIONS 9 +#define SHOW_FIGHTER_DB 6 #define SHOW_GALAXY 0 -#define SHOW_STAR_SYSTEM 1 #define SHOW_MENU 2 #define SHOW_OPTIONS 3 +#define SHOW_STAR_SYSTEM 1 #define SHOW_STATS 4 #define SHOW_TROPHIES 5 -#define SHOW_FIGHTER_DB 6 -#define MAX_LISTED_MISSIONS 9 - -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void initBattle(void); -extern void loadMission(char *filename); -extern SDL_Texture *getTexture(char *filename); -extern AtlasImage *getAtlasImage(char *filename); -extern void startSectionTransition(void); -extern void endSectionTransition(void); -extern void blit(AtlasImage *atlasImage, int x, int y, int centered); -extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); -extern void drawCircle(int cx, int cy, int radius, int r, int g, int b, int a); -extern void playMusic(char *filename, int loop); -extern void stopMusic(void); -extern void doStars(float dx, float dy); -extern void drawStars(void); -extern void limitTextWidth(int width); -extern void drawBackground(SDL_Texture *texture); -extern void initBackground(void); -extern void scrollBackground(float x, float y); -extern void drawWidgets(char *groupName); -extern void doWidgets(void); -extern Widget *getWidget(const char *name, const char *group); -extern void selectWidget(const char *name, const char *group); -extern void initTitle(void); -extern void drawOptions(void); -extern void initOptions(void (*returnFromOptions)(void)); -extern void drawStats(void); -extern void playSound(int id); -extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); -extern void initStatsDisplay(void); -extern void updateAllMissions(void); -extern StarSystem *getStarSystem(char *name); -extern void showOKDialog(void (*callback)(void), const char *format, ...); -extern char *getTranslatedString(char *string); -extern void setMouseCursor(int isDrag); -extern void clearInput(void); +extern void autoSizeWidgetButtons(char *group, int recenter); extern void awardCampaignTrophies(void); extern void awardStatsTrophies(void); -extern void initTrophiesDisplay(void); -extern void drawTrophies(void); +extern void blit(AtlasImage *atlasImage, int x, int y, int centered); +extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); +extern void clearInput(void); +extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); extern void doFighterDatabase(void); -extern void initFighterDatabaseDisplay(void); +extern void doStars(float dx, float dy); +extern void doWidgets(void); +extern void drawBackground(SDL_Texture *texture); +extern void drawCircle(int cx, int cy, int radius, int r, int g, int b, int a); extern void drawFighterDatabase(void); -extern void autoSizeWidgetButtons(char *group, int recenter); +extern void drawOptions(void); +extern void drawStars(void); +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 drawWidgets(char *groupName); +extern void endSectionTransition(void); +extern AtlasImage *getAtlasImage(char *filename); +extern StarSystem *getStarSystem(char *name); +extern SDL_Texture *getTexture(char *filename); +extern Widget *getWidget(const char *name, const char *group); +extern void initBackground(void); +extern void initBattle(void); +extern void initFighterDatabaseDisplay(void); +extern void initOptions(void (*returnFromOptions)(void)); +extern void initStatsDisplay(void); +extern void initTitle(void); +extern void initTrophiesDisplay(void); +extern void loadMission(char *filename); +extern void playMusic(char *filename, int loop); +extern void playSound(int id); +extern void scrollBackground(float x, float y); +extern void selectWidget(const char *name, const char *group); extern void setAtlasColor(int r, int g, int b, int a); +extern void setMouseCursor(int isDrag); +extern void showOKDialog(void (*callback)(void), const char *format, ...); +extern void startSectionTransition(void); +extern void stopMusic(void); +extern void updateAllMissions(void); extern App app; extern Colors colors; diff --git a/src/galaxy/mission.h b/src/galaxy/mission.h index 6911000..ac654c4 100644 --- a/src/galaxy/mission.h +++ b/src/galaxy/mission.h @@ -23,50 +23,49 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "time.h" -extern long lookup(char *name); -extern char *readFile(char *filename); -extern SDL_Texture *getTexture(char *filename); -extern AtlasImage *getAtlasImage(char *filename); -extern void startSectionTransition(void); -extern void endSectionTransition(void); -extern void playMusic(char *filename, int loop); -extern void stopMusic(void); -extern void initPlayer(void); -extern long flagsToLong(char *flags, int *add); -extern Entity *spawnWaypoint(void); -extern void selectWidget(const char *name, const char *group); -extern Entity *spawnJumpgate(int side, long flags); -extern void failIncompleteObjectives(void); +extern void activateNextWaypoint(void); +extern void addAllToQuadtree(void); +extern void addEpicKillsObjective(void); +extern void addEpicLivesObjective(void); +extern void awardCraftTrophy(void); +extern void awardPostMissionTrophies(void); +extern void awardStatsTrophies(void); extern void completeConditions(void); -extern void retreatEnemies(void); -extern void initScript(cJSON *missionJSON); extern void countNumEnemies(void); -extern void initMissionInfo(void); -extern char *getTranslatedString(char *string); -extern void updateStarSystemMissions(void); -extern void updateChallengeMissions(void); +extern void endSectionTransition(void); +extern void failIncompleteObjectives(void); +extern long flagsToLong(char *flags, int *add); +extern AtlasImage *getAtlasImage(char *filename); extern char *getBackgroundTextureName(unsigned long n); -extern char *getPlanetTextureName(unsigned long n); -extern char *getMusicFilename(unsigned long n); extern int getJSONValue(cJSON *node, char *name, int defValue); extern char *getJSONValueStr(cJSON *node, char *name, char *defValue); -extern void addAllToQuadtree(void); -extern void loadObjectives(cJSON *node); -extern void loadPlayer(cJSON *node); +extern char *getMusicFilename(unsigned long n); +extern char *getPlanetTextureName(unsigned long n); +extern SDL_Texture *getTexture(char *filename); +extern void initMissionInfo(void); +extern void initPlayer(void); +extern void initScript(cJSON *missionJSON); extern void loadCapitalShips(cJSON *node); +extern void loadChallenge(Mission *mission, cJSON *node); extern void loadFighters(cJSON *node); extern void loadItems(cJSON *node); extern void loadLocations(cJSON *node); +extern void loadObjectives(cJSON *node); +extern void loadPlayer(cJSON *node); extern void loadSpawners(cJSON *node); -extern void loadChallenge(Mission *mission, cJSON *node); -extern Entity *spawnMine(int type); -extern void activateNextWaypoint(void); -extern void awardStatsTrophies(void); -extern void awardPostMissionTrophies(void); -extern void awardCraftTrophy(void); +extern long lookup(char *name); +extern void playMusic(char *filename, int loop); +extern char *readFile(char *filename); +extern void retreatEnemies(void); +extern void selectWidget(const char *name, const char *group); extern void setInitialPlayerAngle(void); -extern void addEpicLivesObjective(void); -extern void addEpicKillsObjective(void); +extern Entity *spawnJumpgate(int side, long flags); +extern Entity *spawnMine(int type); +extern Entity *spawnWaypoint(void); +extern void startSectionTransition(void); +extern void stopMusic(void); +extern void updateChallengeMissions(void); +extern void updateStarSystemMissions(void); extern Battle battle; extern Dev dev; diff --git a/src/galaxy/starSystems.h b/src/galaxy/starSystems.h index b51091e..16c26f2 100644 --- a/src/galaxy/starSystems.h +++ b/src/galaxy/starSystems.h @@ -22,12 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" -extern char *readFile(char *filename); -extern long lookup(char *name); -extern int isMissionAvailable(Mission *mission, Mission *prev); extern char **getFileList(char *dir, int *count); -extern Mission *loadMissionMeta(char *filename); extern int getJSONValue(cJSON *node, char *name, int defValue); -extern char *getTranslatedString(char *string); +extern int isMissionAvailable(Mission *mission, Mission *prev); +extern Mission *loadMissionMeta(char *filename); +extern long lookup(char *name); +extern char *readFile(char *filename); extern Game game; diff --git a/src/game/credits.h b/src/game/credits.h index 24a64ca..cc112a3 100644 --- a/src/game/credits.h +++ b/src/game/credits.h @@ -23,19 +23,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CREDIT_LINE_LIMIT (SCREEN_WIDTH - 300) -extern SDL_Texture *getTexture(const char *filename); -extern AtlasImage *getAtlasImage(const char *filename); -extern void playMusic(char *filename, int loop); -extern void drawBackground(SDL_Texture *texture); -extern void startSectionTransition(void); -extern void endSectionTransition(void); -extern void stopMusic(void); extern void blit(AtlasImage *atlasImage, int x, int y, int centered); -extern char *readFile(char *filename); +extern void drawBackground(SDL_Texture *texture); extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void limitTextWidth(int width); +extern void endSectionTransition(void); +extern AtlasImage *getAtlasImage(const char *filename); +extern SDL_Texture *getTexture(const char *filename); extern int getWrappedTextHeight(char *text, int size); extern void initTitle(void); +extern void playMusic(char *filename, int loop); +extern char *readFile(char *filename); +extern void startSectionTransition(void); +extern void stopMusic(void); extern App app; extern Colors colors; diff --git a/src/game/fighterDatabase.h b/src/game/fighterDatabase.h index 019113a..638d305 100644 --- a/src/game/fighterDatabase.h +++ b/src/game/fighterDatabase.h @@ -20,15 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern void drawWidgets(char *groupName); -extern Widget *getWidget(const char *name, const char *group); -extern char *getTranslatedString(char *string); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern Entity **getDBFighters(int *num); extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); +extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); +extern void drawWidgets(char *groupName); +extern Entity **getDBFighters(int *num); +extern Widget *getWidget(const char *name, const char *group); extern float mod(float n, float x); -extern void limitTextWidth(int width); -extern char *getTranslatedString(char *string); extern App app; extern Colors colors; diff --git a/src/game/stats.h b/src/game/stats.h index a36c2f4..2c8f1cb 100644 --- a/src/game/stats.h +++ b/src/game/stats.h @@ -22,12 +22,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define STATS_PER_PAGE 9 -extern void drawWidgets(char *groupName); extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern Widget *getWidget(const char *name, const char *group); -extern char *getTranslatedString(char *string); -extern char *timeToString(long millis, int showHours); +extern void drawWidgets(char *groupName); extern int getPercent(float current, float total); +extern Widget *getWidget(const char *name, const char *group); +extern char *timeToString(long millis, int showHours); extern App app; extern Colors colors; diff --git a/src/game/title.h b/src/game/title.h index 0ca69cf..fcb633d 100644 --- a/src/game/title.h +++ b/src/game/title.h @@ -20,56 +20,55 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -#define SHOW_TITLE 0 -#define SHOW_STATS 1 -#define SHOW_OPTIONS 2 -#define SHOW_TROPHIES 3 -#define SHOW_FIGHTER_DB 4 - #define NUM_FIGHTERS 12 +#define SHOW_FIGHTER_DB 4 +#define SHOW_OPTIONS 2 +#define SHOW_STATS 1 +#define SHOW_TITLE 0 +#define SHOW_TROPHIES 3 +extern void addEngineEffect(void); +extern void autoSizeWidgetButtons(char *group, int recenter); +extern void blit(AtlasImage *atlasImage, int x, int y, int centered); +extern void clearInput(void); +extern void destroyBattle(void); +extern void doEffects(void); +extern void doFighterDatabase(void); +extern void doStars(float dx, float dy); +extern void doWidgets(void); +extern void drawBackground(SDL_Texture *texture); +extern void drawEffects(void); +extern void drawFighterDatabase(void); +extern void drawOptions(void); +extern void drawStars(void); +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 drawWidgets(char *groupName); +extern void endSectionTransition(void); extern AtlasImage *getAtlasImage(const char *filename); extern SDL_Texture *getTexture(const char *filename); -extern void startSectionTransition(void); -extern void endSectionTransition(void); -extern void blit(AtlasImage *atlasImage, int x, int y, int centered); -extern void stopMusic(void); -extern void doStars(float dx, float dy); -extern void drawStars(void); -extern void drawBackground(SDL_Texture *texture); -extern void initBackground(void); -extern void scrollBackground(float x, float y); -extern void addEngineEffect(void); -extern void doEffects(void); -extern void drawEffects(void); -extern void drawWidgets(char *groupName); -extern void doWidgets(void); extern Widget *getWidget(const char *name, const char *group); +extern void initBackground(void); +extern void initChallengeHome(void); +extern void initCredits(void); +extern void initEffects(void); +extern void initFighterDatabaseDisplay(void); extern void initGalacticMap(void); extern void initOptions(void (*returnFromOptions)(void)); -extern void drawOptions(void); extern void initStatsDisplay(void); -extern void playMusic(char *filename, int loop); -extern void destroyBattle(void); -extern void playSound(int id); -extern void initEffects(void); -extern void initChallengeHome(void); -extern void selectWidget(const char *name, const char *group); -extern void drawStats(void); -extern void updateAllMissions(void); -extern void clearInput(void); extern void initTrophiesDisplay(void); -extern void drawTrophies(void); -extern void initCredits(void); -extern void drawFighterDatabase(void); -extern void initFighterDatabaseDisplay(void); -extern void doFighterDatabase(void); -extern void autoSizeWidgetButtons(char *group, int recenter); +extern void playMusic(char *filename, int loop); +extern void playSound(int id); +extern void scrollBackground(float x, float y); +extern void selectWidget(const char *name, const char *group); extern void setAtlasColor(int r, int g, int b, int a); +extern void startSectionTransition(void); +extern void stopMusic(void); +extern void updateAllMissions(void); extern App app; extern Battle battle; extern Colors colors; -extern Game game; extern Entity *self; +extern Game game; diff --git a/src/game/trophies.h b/src/game/trophies.h index 24e90fe..2b7edfd 100644 --- a/src/game/trophies.h +++ b/src/game/trophies.h @@ -18,31 +18,31 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define TROPHIES_PER_PAGE 4 #include "../common.h" #include "../json/cJSON.h" #include "time.h" -extern long lookup(char *name); -extern char *readFile(char *filename); -extern int getJSONValue(cJSON *node, char *name, int defValue); -extern int getPercent(float current, float total); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); +#define TROPHIES_PER_PAGE 4 + +extern void awardPandoranCraftTrophy(void); extern void blit(AtlasImage *atlasImage, int x, int y, int centered); extern void blitRotated(AtlasImage *atlasImage, int x, int y, float angle); extern void blitScaled(AtlasImage *atlasImage, int x, int y, int w, int h, int center); -extern char *getTranslatedString(char *string); -extern AtlasImage *getAtlasImage(char *filename); -extern void playSound(int id); -extern Widget *getWidget(const char *name, const char *group); -extern void drawWidgets(char *groupName); -extern char *timeToDate(long millis); extern void calcTextDimensions(char *text, int size, int *w, int *h); -extern void awardPandoranCraftTrophy(void); +extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); +extern void drawWidgets(char *groupName); +extern AtlasImage *getAtlasImage(char *filename); +extern int getJSONValue(cJSON *node, char *name, int defValue); +extern int getPercent(float current, float total); +extern Widget *getWidget(const char *name, const char *group); +extern long lookup(char *name); extern float mod(float n, float x); +extern void playSound(int id); +extern char *readFile(char *filename); extern void setAtlasColor(int r, int g, int b, int a); +extern char *timeToDate(long millis); extern App app; extern Battle battle; diff --git a/src/main.h b/src/main.h index 99b14ae..302b4b3 100644 --- a/src/main.h +++ b/src/main.h @@ -25,41 +25,34 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "structs.h" extern void cleanup(void); -extern void initSDL(void); -extern void initGameSystem(void); -extern void initTitle(void); -extern void loadTestMission(char *filename); -extern void saveScreenshot(void); -extern void doMouseDown(SDL_MouseButtonEvent *event); -extern void doMouseUp(SDL_MouseButtonEvent *event); -extern void doMouseWheel(SDL_MouseWheelEvent *event); -extern void doMouseMotion(SDL_MouseMotionEvent *event); +extern void clearControl(int type); +extern void createScreenshotFolder(void); extern void doDevKeys(void); -extern void expireTexts(int all); -extern void prepareScene(void); -extern void presentScene(void); +extern void doInput(void); extern void doModalDialog(void); +extern void doTrophyAlerts(void); extern void drawModalDialog(void); -extern void loadGame(void); +extern void drawTrophyAlert(void); extern int fileExists(char *filename); extern char *getSaveFilePath(char *filename); extern void init18N(int argc, char *argv[]); -extern void initLookups(void); -extern void doKeyDown(SDL_KeyboardEvent *event); -extern void doKeyUp(SDL_KeyboardEvent *event); -extern void createScreenshotFolder(void); -extern int isControl(int type); -extern void clearControl(int type); -extern void saveGame(void); extern void initCredits(void); -extern void doTrophyAlerts(void); -extern void drawTrophyAlert(void); -extern void doInput(void); +extern void initGameSystem(void); +extern void initLookups(void); +extern void initSDL(void); +extern void initTitle(void); +extern int isControl(int type); +extern void loadGame(void); +extern void loadTestMission(char *filename); +extern void prepareScene(void); +extern void presentScene(void); +extern void saveGame(void); +extern void saveScreenshot(void); App app; -Colors colors; Battle battle; +Colors colors; Dev dev; -Entity *self; Entity *player; +Entity *self; Game game; diff --git a/src/system/controls.h b/src/system/controls.h index f102fda..b4bf21f 100644 --- a/src/system/controls.h +++ b/src/system/controls.h @@ -22,12 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern char *getTranslatedString(char *string); -extern Widget *getWidget(const char *name, const char *group); extern void drawWidgets(char *groupName); extern char *getLookupName(char *prefix, long num); +extern Widget *getWidget(const char *name, const char *group); extern long lookup(char *name); -extern void limitTextWidth(int width); extern char *readFile(char *filename); extern App app; diff --git a/src/system/dev.h b/src/system/dev.h index 1b0a4a3..9a57ca3 100644 --- a/src/system/dev.h +++ b/src/system/dev.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" +extern void completeMission(void); + extern App app; extern Battle battle; extern Dev dev; - -extern void completeMission(void); diff --git a/src/system/draw.h b/src/system/draw.h index 4cceac9..60ca43e 100644 --- a/src/system/draw.h +++ b/src/system/draw.h @@ -20,9 +20,9 @@ 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 drawMouse(void); extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); +extern void drawMouse(void); +extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); extern App app; extern Battle battle; diff --git a/src/system/init.h b/src/system/init.h index bc13965..ddf5580 100644 --- a/src/system/init.h +++ b/src/system/init.h @@ -28,55 +28,53 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "SDL2/SDL_mixer.h" #include "SDL2/SDL_ttf.h" -extern void prepareScene(void); -extern void presentScene(void); -extern int fileExists(char *filename); -extern char *readFile(char *filename); -extern int writeFile(char *filename, char *data); -extern char *getSaveFilePath(char *filename); -extern void initSounds(void); -extern void loadFighterDefs(void); -extern void loadCapitalShipDefs(void); -extern void loadItemDefs(void); -extern void initFonts(void); -extern void initBulletDefs(void); -extern void initGame(void); -extern void initStats(void); -extern void initStarSystems(void); -extern void initChallenges(void); -extern void initWidgets(void); -extern void initBackground(void); -extern void initResources(void); -extern void initControls(void); -extern void initAtlas(void); -extern void initFighterDatabase(void); -extern void destroyLookups(void); -extern void destroyFonts(void); -extern void destroySounds(void); -extern void destroyGame(void); -extern void destroyFighterDefs(void); -extern void destroyCapitalShipDefs(void); -extern void destroyBulletDefs(void); -extern void destroyItemDefs(void); -extern void destroyStarSystems(void); +extern void createSaveFolder(void); extern void destroyBattle(void); -extern void destroyTextures(void); -extern void destroyGalacticMap(void); -extern void destroyWidgets(void); -extern void destroyResources(void); +extern void destroyBulletDefs(void); +extern void destroyCapitalShipDefs(void); +extern void destroyCredits(void); extern void destroyFighterDatabase(void); +extern void destroyFighterDefs(void); extern void destroyFighterStats(void); -extern void expireTexts(int all); +extern void destroyGalacticMap(void); +extern void destroyGame(void); +extern void destroyItemDefs(void); +extern void destroyLookups(void); +extern void destroyResources(void); +extern void destroySounds(void); +extern void destroyStarSystems(void); +extern void destroyTextures(void); +extern void destroyWidgets(void); +extern int fileExists(char *filename); +extern int getJSONValue(cJSON *node, char *name, int defValue); +extern char *getLookupName(char *prefix, long num); +extern char *getSaveFilePath(char *filename); +extern void initAtlas(void); +extern void initBackground(void); +extern void initBulletDefs(void); +extern void initChallenges(void); +extern void initControls(void); +extern void initFighterDatabase(void); +extern void initFonts(void); +extern void initGame(void); extern void initInput(void); extern void initModalDialog(void); -extern void createSaveFolder(void); -extern void setLanguage(char *applicationName, char *languageCode); -extern char *getLookupName(char *prefix, long num); -extern long lookup(char *name); +extern void initResources(void); +extern void initSounds(void); +extern void initStarSystems(void); extern void initStars(void); +extern void initStats(void); extern void initTrophies(void); -extern void destroyCredits(void); -extern int getJSONValue(cJSON *node, char *name, int defValue); +extern void initWidgets(void); +extern void loadCapitalShipDefs(void); +extern void loadFighterDefs(void); +extern void loadItemDefs(void); +extern long lookup(char *name); +extern void prepareScene(void); +extern void presentScene(void); +extern char *readFile(char *filename); +extern void setLanguage(char *applicationName, char *languageCode); +extern int writeFile(char *filename, char *data); extern App app; extern Colors colors; diff --git a/src/system/input.h b/src/system/input.h index dc215fc..64f4389 100644 --- a/src/system/input.h +++ b/src/system/input.h @@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" -extern AtlasImage *getAtlasImage(char *filename); extern void blit(AtlasImage *atlasImage, int x, int y, int centered); +extern AtlasImage *getAtlasImage(char *filename); extern void musicSetPlaying(int playing); extern App app; diff --git a/src/system/load.h b/src/system/load.h index a3fe33a..f2e4048 100644 --- a/src/system/load.h +++ b/src/system/load.h @@ -22,14 +22,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" -extern char *readFile(char *filename); -extern Mission *getMission(char *filename); +extern void destroyFighterStats(void); extern Challenge *getChallenge(Mission *mission, int type, int value); -extern int lookup(char *lookup); -extern char *getSaveFilePath(char *filename); extern char *getLookupName(char *prefix, long num); +extern Mission *getMission(char *filename); +extern char *getSaveFilePath(char *filename); extern StarSystem *getStarSystem(char *name); extern Trophy *getTrophy(char *id); -extern void destroyFighterStats(void); +extern int lookup(char *lookup); +extern char *readFile(char *filename); extern Game game; diff --git a/src/system/modalDialog.h b/src/system/modalDialog.h index 4865ee6..11cde3d 100644 --- a/src/system/modalDialog.h +++ b/src/system/modalDialog.h @@ -21,12 +21,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" extern void clearInput(void); +extern void doWidgets(void); extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); extern void drawWidgets(char *groupName); extern Widget *getWidget(const char *name, const char *group); -extern void doWidgets(void); extern int getWrappedTextHeight(char *text, int size); -extern void limitTextWidth(int width); extern App app; extern Colors colors; diff --git a/src/system/options.h b/src/system/options.h index 66b067f..460baf8 100644 --- a/src/system/options.h +++ b/src/system/options.h @@ -22,19 +22,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "SDL2/SDL_mixer.h" -#define SHOW_MAIN 0 #define SHOW_CONTROLS 1 +#define SHOW_MAIN 0 -extern void selectWidget(const char *name, const char *group); -extern Widget *getWidget(const char *name, const char *group); -extern void drawWidgets(char *groupName); -extern void setWidgetOption(const char *name, const char *group, const char *value); -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern void saveConfig(void); -extern void limitTextWidth(int width); -extern char *getTranslatedString(char *string); extern void drawControls(void); +extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); +extern void drawWidgets(char *groupName); +extern Widget *getWidget(const char *name, const char *group); extern void initControlsDisplay(void); +extern void saveConfig(void); +extern void selectWidget(const char *name, const char *group); +extern void setWidgetOption(const char *name, const char *group, const char *value); extern App app; extern Colors colors; diff --git a/src/system/save.h b/src/system/save.h index fe84211..104b307 100644 --- a/src/system/save.h +++ b/src/system/save.h @@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" -extern int writeFile(char *filename, char *data); extern char *getLookupName(char *prefix, long num); extern char *getSaveFilePath(char *filename); +extern int writeFile(char *filename, char *data); extern Game game; diff --git a/src/system/sound.h b/src/system/sound.h index 0991998..d34d65d 100644 --- a/src/system/sound.h +++ b/src/system/sound.h @@ -25,8 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_BATTLE_SOUND_DISTANCE 1500 #define MIN_BATTLE_SOUND_DISTANCE 100 -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 Entity *player; diff --git a/src/system/transition.h b/src/system/transition.h index 536d1db..dc12f06 100644 --- a/src/system/transition.h +++ b/src/system/transition.h @@ -20,9 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../common.h" +extern void clearInput(void); extern void prepareScene(void); extern void presentScene(void); -extern void clearInput(void); -extern void expireTexts(int all); - -extern App app; diff --git a/src/system/widgets.h b/src/system/widgets.h index cb5f5e8..d1083cb 100644 --- a/src/system/widgets.h +++ b/src/system/widgets.h @@ -22,20 +22,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../json/cJSON.h" -extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); -extern char *readFile(char *filename); -extern long lookup(char *name); extern void blit(AtlasImage *atlasImage, int x, int y, int centered); -extern AtlasImage *getAtlasImage(char *filename); -extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); -extern void playSound(int id); -extern char **getFileList(char *dir, int *count); -extern char *getTranslatedString(char *string); -extern void updateControlKey(char *name); -extern void updateControlButton(char *name); +extern void calcTextDimensions(char *text, int size, int *w, int *h); extern void clearControlConfig(char *name); extern void clearInput(void); -extern void calcTextDimensions(char *text, int size, int *w, int *h); +extern int collision(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); +extern void drawText(int x, int y, int size, int align, SDL_Color c, const char *format, ...); +extern AtlasImage *getAtlasImage(char *filename); +extern char **getFileList(char *dir, int *count); +extern long lookup(char *name); +extern void playSound(int id); +extern char *readFile(char *filename); +extern void updateControlButton(char *name); +extern void updateControlKey(char *name); extern App app; extern Colors colors; diff --git a/tools/tidyHeaders.sh b/tools/tidyHeaders.sh index a187ed6..d792edc 100755 --- a/tools/tidyHeaders.sh +++ b/tools/tidyHeaders.sh @@ -95,7 +95,7 @@ function cleanHeader($headerFile) foreach ($header as $line) { - if ((preg_match("/extern|define/", $line) || preg_match("/;$/", $line)) && strstr($line, "getTranslatedString") === FALSE) + if ((preg_match("/extern|define/", $line) || preg_match("/;$/", $line))) { preg_match($func_pattern, $line, $matches);