Prevent inclusion of headers multiple times, on an individual level.

Previously, Starfighter depended on a single check in Starfighter.h
to prevent this. Now, the proper code is in all header files.

src/Starfighter.h

@@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __STARFIGHTER_H__
+#ifndef STARFIGHTER_H
-#define __STARFIGHTER_H__
+#define STARFIGHTER_H
 
 #include <stdlib.h>
 #include <string.h>

src/ai.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef AI_H
+#define AI_H
+
 extern void setEnemyAI(object *theEnemy);
 extern void setKlineAttackMethod(object *theEnemy);
 extern void setKlineAI(object *theEnemy);
+
+#endif

src/aliens.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef ALIENS_H
+#define ALIENS_H
+
 extern object defEnemy[MAX_DEFALIENS];
 extern object enemy[MAX_ALIENS];
 
@@ -26,3 +30,5 @@ extern void killAllAliens();
 extern void doAliens();
 extern void setAlienShapes();
 extern void defineAliens();
+
+#endif

src/audio.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011, 2012 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,9 +17,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef AUDIO_H
+#define AUDIO_H
+
 extern Mix_Chunk *sound[MAX_SOUNDS];
 
 extern void playSound(int sid, float x = 400);
 extern Mix_Chunk *loadSound(const char *filename);
 extern void loadMusic(const char *filename);
 extern void playRandomTrack();
+
+#endif

src/bullets.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,8 +17,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _BULLETS_H_
+#define _BULLETS_H_
+
 extern void addBullet(object *theWeapon, object *attacker, int y, int dy);
 extern void fireBullet(object *attacker, int weaponType);
 extern char checkPlayerShockDamage(float x, float y);
 extern void fireRay(object *attacker);
 extern void doBullets();
+
+#endif

src/cargo.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,8 +17,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef _CARGO_H_
+#define _CARGO_H_
+
 extern object cargo[MAX_CARGO];
 
 extern void initCargo();
 extern object *addCargo(object *owner, int cargoType);
 extern void doCargo();
+
+#endif

src/collectable.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef COLLECTABLE_H
+#define COLLECTABLE_H
+
 extern void addCollectable(float x, float y, int type, int value, int life);
 extern void checkMineBulletCollisions(object *bullet);
 extern void doCollectables();
+
+#endif

src/comms.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef COMMS_H
+#define COMMS_H
+
 extern void updateCommsSurface(SDL_Surface *comms);
 extern void createCommsSurface(SDL_Surface *comms);
 extern void doComms(SDL_Surface *comms);
+
+#endif

src/debris.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,5 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef DEBRIS_H
+#define DEBRIS_H
+
 extern void addDebris(int x, int y, int amount);
 extern void doDebris();
+
+#endif

src/defs.h

@@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef DEFS_H
+#define DEFS_H
+
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
@@ -365,3 +368,5 @@ const float cameraMaxSpeed = 3.;
 const int maxHoming = 20;
 const int maxDoubleHoming = 15;
 const int maxMicroHoming = 10;
+
+#endif

src/events.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,4 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef EVENTS_H
+#define EVENTS_H
+
 extern bool checkPauseRequest();
+
+#endif

src/explosions.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,11 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef EXPLOSIONS_H
+#define EXPLOSIONS_H
+
 extern void addExplosion(float x, float y, int type);
 extern void addEngine(object *craft);
 extern void doExplosions();
+
+#endif

src/game.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,7 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef GAME_H
+#define GAME_H
+
 extern Game currentGame;
 
 extern void newGame();
 extern int mainGameLoop();
+
+#endif

src/globals.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,7 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef GLOBALS_H
+#define GLOBALS_H
+
 extern devVariables dev;
 extern globalEngineVariables engine;
 
 extern void defineGlobals();
+
+#endif

src/graphics.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef GRAPHICS_H
+#define GRAPHICS_H
+
 extern Star star[200];
 
 extern Uint32 red;
@@ -80,3 +84,5 @@ extern void freeGraphics();
 
 extern SDL_Surface *loadImage(const char *filename);
 extern void doStarfield();
+
+#endif

src/init.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,7 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef INIT_H
+#define INIT_H
+
 extern void initVars();
 extern void showErrorAndExit(int errorId, const char *name);
 extern void initSystem();
 extern void cleanUp();
+
+#endif

src/intermission.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,4 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef INTERMISSION_H
+#define INTERMISSION_H
+
 extern int galaxyMap();
+
+#endif

src/loadSave.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,8 +17,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef LOADSAVE_H
+#define LOADSAVE_H
+
 extern int initSaveSlots();
 extern bool loadGame(int slot);
 extern void saveGame(int slot);
 extern void createSavesSurface(SDL_Surface *savesSurface, signed char clickedSlot);
 extern int showSaveSlots(SDL_Surface *savesSurface, signed char saveSlot);
+
+#endif

src/math.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef MATH_H
+#define MATH_H
+
 static inline void limitChar(signed char *in, int low, int high)
 {
 	if (*in < low)
@@ -105,3 +109,5 @@ static inline int rrand(int min, int max)
 
 	return r;
 }
+
+#endif

src/messages.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,8 +17,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef MESSAGES_H
+#define MESSAGES_H
+
 extern void getKillMessage(object *ally);
 extern const char *getKlineInsult();
 extern void getPlayerDeathMessage();
 extern void getMissFireMessage(object *ally);
 extern void getPlayerHitMessage(object *ally);
+
+#endif

src/misc.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,9 +17,14 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef MISC_H
+#define MISC_H
+
 extern void clearInfoLines();
 extern void setInfoLine(const char *in, int color);
 extern void setRadioMessage(signed char face, const char *in, int priority);
 extern void doInfo();
 extern int getFace(const char *face);
 extern void resetLists();
+
+#endif

src/missions.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef MISSIONS_H
+#define MISSIONS_H
+
 extern Planet systemPlanet[10];
 extern mission currentMission;
 
@@ -30,3 +34,5 @@ extern bool missionFailed();
 extern void missionBriefScreen();
 extern void missionFinishedScreen();
 extern void initMissions();
+
+#endif

src/player.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef PLAYER_H
+#define PLAYER_H
+
 extern object player;
 
 extern void initPlayer();
@@ -24,3 +28,5 @@ extern void doPlayer();
 extern void flushInput();
 extern void getPlayerInput();
 extern void leaveSector();
+
+#endif

src/resources.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,8 +17,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef RESOURCES_H
+#define RESOURCES_H
+
 extern void loadBackground(const char *filename);
 extern void loadGameGraphics();
 extern void loadSound();
 extern void freeSound();
 extern void loadFont();
+
+#endif

src/script.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,7 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef SCRIPT_H
+#define SCRIPT_H
+
 extern void loadScriptEvents();
 extern void checkScriptEvents();
 extern void syncScriptEvents();
 extern void doCutscene(int scene);
+
+#endif

src/shop.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,5 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef SHOP_H
+#define SHOP_H
+
 extern void initShop();
 extern void showShop();
+
+#endif

src/structs.h

@@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef STRUCTS_H
+#define STRUCTS_H
+
 struct object {
 
 	bool active;
@@ -317,5 +320,4 @@ struct devVariables {
 	
 };
 
-
+#endif
-

src/title.h

@@ -17,7 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef TITLE_H
+#define TITLE_H
+
 extern int doTitle();
 extern void showStory();
 extern void gameover();
 extern void doCredits();
+
+#endif

src/weapons.h

@@ -1,6 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011 Guus Sliepen
+Copyright (C) 2015 Julian Marchant
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,7 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifndef WEAPONS_H
+#define WEAPONS_H
+
 extern object weapon[MAX_WEAPONS];
 
 extern void setWeaponShapes();
 extern void initWeapons();
+
+#endif