Fix warnings.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3514 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/uqm/dummy.h

@@ -19,34 +19,34 @@
 
 #include "races.h"
 
-RACE_DESC *init_androsynth (void);
-RACE_DESC *init_arilou (void);
-RACE_DESC *init_black_urquan (void);
-RACE_DESC *init_chenjesu (void);
-RACE_DESC *init_chmmr (void);
-RACE_DESC *init_druuge (void);
-RACE_DESC *init_human (void);
-RACE_DESC *init_ilwrath (void);
-RACE_DESC *init_melnorme (void);
-RACE_DESC *init_mmrnmhrm (void);
-RACE_DESC *init_mycon (void);
-RACE_DESC *init_orz (void);
-RACE_DESC *init_pkunk (void);
-RACE_DESC *init_shofixti (void);
-RACE_DESC *init_slylandro (void);
-RACE_DESC *init_spathi (void);
-RACE_DESC *init_supox (void);
-RACE_DESC *init_syreen (void);
-RACE_DESC *init_thraddash (void);
-RACE_DESC *init_umgah (void);
-RACE_DESC *init_urquan (void);
-RACE_DESC *init_utwig (void);
-RACE_DESC *init_vux (void);
-RACE_DESC *init_yehat (void);
-RACE_DESC *init_zoqfotpik (void);
-RACE_DESC *init_samatra (void);
-RACE_DESC *init_sis (void);
-RACE_DESC *init_probe (void);
+#include "ships/androsyn/androsyn.h"
+#include "ships/arilou/arilou.h"
+#include "ships/blackurq/blackurq.h"
+#include "ships/chenjesu/chenjesu.h"
+#include "ships/chmmr/chmmr.h"
+#include "ships/druuge/druuge.h"
+#include "ships/human/human.h"
+#include "ships/ilwrath/ilwrath.h"
+#include "ships/melnorme/melnorme.h"
+#include "ships/mmrnmhrm/mmrnmhrm.h"
+#include "ships/mycon/mycon.h"
+#include "ships/orz/orz.h"
+#include "ships/pkunk/pkunk.h"
+#include "ships/shofixti/shofixti.h"
+#include "ships/slylandr/slylandr.h"
+#include "ships/spathi/spathi.h"
+#include "ships/supox/supox.h"
+#include "ships/syreen/syreen.h"
+#include "ships/thradd/thradd.h"
+#include "ships/umgah/umgah.h"
+#include "ships/urquan/urquan.h"
+#include "ships/utwig/utwig.h"
+#include "ships/vux/vux.h"
+#include "ships/yehat/yehat.h"
+#include "ships/zoqfot/zoqfot.h"
+#include "ships/lastbat/lastbat.h"
+#include "ships/sis_ship/sis_ship.h"
+#include "ships/probe/probe.h"
 
 #endif  /* DUMMY_H */
 

sc2/src/uqm/ships/androsyn/androsyn.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "androsyn.h"
 #include "resinst.h"
 
 #include "libs/mathlib.h"

sc2/src/uqm/ships/arilou/arilou.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "arilou.h"
 #include "resinst.h"
 
 #include "libs/mathlib.h"

sc2/src/uqm/ships/blackurq/blackurq.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "blackurq.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"

sc2/src/uqm/ships/chenjesu/chenjesu.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "chenjesu.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"

sc2/src/uqm/ships/chmmr/chmmr.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "chmmr.h"
 #include "resinst.h"
 
 #include "uqm/colors.h"

sc2/src/uqm/ships/druuge/druuge.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "druuge.h"
 #include "resinst.h"
 
 #define MAX_CREW 14

sc2/src/uqm/ships/human/human.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "human.h"
 #include "resinst.h"
 
 #include "uqm/colors.h"

sc2/src/uqm/ships/ilwrath/ilwrath.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "ilwrath.h"
 #include "resinst.h"
 
 #include "uqm/colors.h"

sc2/src/uqm/ships/lastbat/lastbat.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "lastbat.h"
 #include "resinst.h"
 
 #include "uqm/colors.h"

sc2/src/uqm/ships/melnorme/melnorme.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "melnorme.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"

sc2/src/uqm/ships/mmrnmhrm/mmrnmhrm.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "mmrnmhrm.h"
 #include "resinst.h"
 
 

sc2/src/uqm/ships/mycon/mycon.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "mycon.h"
 #include "resinst.h"
 
 #define MAX_CREW 20

sc2/src/uqm/ships/orz/orz.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "orz.h"
 #include "resinst.h"
 
 #include "uqm/colors.h"

sc2/src/uqm/ships/pkunk/pkunk.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "pkunk.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"
@@ -314,7 +315,7 @@ intercept_pkunk_death (ELEMENT *ElementPtr)
 #define START_PHOENIX_COLOR BUILD_COLOR (MAKE_RGB15 (0x1F, 0x15, 0x00), 0x7A)
 #define TRANSITION_LIFE 1
 
-void
+static void
 spawn_phoenix_trail (ELEMENT *ElementPtr)
 {
 	static const Color colorTable[] =
@@ -349,7 +350,7 @@ spawn_phoenix_trail (ELEMENT *ElementPtr)
 
 #define PHOENIX_LIFE 12
 
-void
+static void
 phoenix_transition (ELEMENT *ElementPtr)
 {
 	HELEMENT hShipImage;

sc2/src/uqm/ships/probe/probe.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "probe.h"
 #include "resinst.h"
 
 #define MAX_CREW 1

sc2/src/uqm/ships/shofixti/shofixti.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "shofixti.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"
@@ -222,9 +223,8 @@ destruct_preprocess (ELEMENT *ElementPtr)
 }
 
 /* In order to detect any Orz Marines that have boarded the ship
-   when it self-destructs, we'll need to see these Orz functions */
-extern void intruder_preprocess (ELEMENT*);
-extern void marine_collision (ELEMENT*, POINT*, ELEMENT*, POINT*);
+   when it self-destructs, we'll need to see some Orz functions */
+#include "../orz/orz.h"
 #define ORZ_MARINE(ptr) (ptr->preprocess_func == intruder_preprocess && \
 		ptr->collision_func == marine_collision)
 

sc2/src/uqm/ships/sis_ship/sis_ship.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "sis_ship.h"
 #include "resinst.h"
 
 #include "uqm/colors.h"

sc2/src/uqm/ships/slylandr/slylandr.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "slylandr.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"

sc2/src/uqm/ships/spathi/spathi.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "spathi.h"
 #include "resinst.h"
 
 #define MAX_CREW 30

sc2/src/uqm/ships/supox/supox.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "supox.h"
 #include "resinst.h"
 
 #include "libs/mathlib.h"

sc2/src/uqm/ships/syreen/syreen.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "syreen.h"
 #include "resinst.h"
 
 #include "libs/mathlib.h"

sc2/src/uqm/ships/thradd/thradd.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "thradd.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"

sc2/src/uqm/ships/umgah/umgah.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "umgah.h"
 #include "resinst.h"
 
 #include "libs/mathlib.h"

sc2/src/uqm/ships/urquan/urquan.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "urquan.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"

sc2/src/uqm/ships/utwig/utwig.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "utwig.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"

sc2/src/uqm/ships/vux/vux.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "vux.h"
 #include "resinst.h"
 
 #include "uqm/globdata.h"

sc2/src/uqm/ships/yehat/yehat.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "yehat.h"
 #include "resinst.h"
 
 #include "libs/mathlib.h"

sc2/src/uqm/ships/zoqfot/zoqfot.c

@@ -17,6 +17,7 @@
  */
 
 #include "../ship.h"
+#include "zoqfot.h"
 #include "resinst.h"
 
 #include "libs/mathlib.h"

sc2/src/uqm/tactrans.c

@@ -425,7 +425,7 @@ new_ship (ELEMENT *DeadShipPtr)
 	}
 }
 
-void
+static void
 explosion_preprocess (ELEMENT *ShipPtr)
 {
 	BYTE i;
@@ -580,7 +580,7 @@ ship_death (ELEMENT *ShipPtr)
 
 // Called from the death_func of an element for an ion trail pixel, or a
 // ship shadow (when warping in/out).
-void
+static void
 cycle_ion_trail (ELEMENT *ElementPtr)
 {
 	static const Color colorTab[] =