From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 20 Jan 2014 21:20:21 +0000 (+0100)
Subject: shpsub: Move declarations to ship.h
X-Git-Tag: v4.3.33~228
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=a0cdd157f1fe4236bb9c150c226ef386d885e22b

shpsub: Move declarations to ship.h

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---

diff --git a/include/prototypes.h b/include/prototypes.h
index aa0c19714..3d320fa52 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -629,17 +629,7 @@ extern void show_news(int);
 extern void show_product(int);
 extern void show_updates(int);
 /* shpsub.c */
-extern void shp_sel(struct nstr_item *, struct emp_qelem *);
-extern void shp_nav(struct emp_qelem *, double *, double *, int *, natid);
-extern int shp_sweep(struct emp_qelem *, int, int, natid);
-extern int shp_check_nav(struct sctstr *, struct shpstr *);
-extern int sect_has_dock(struct sctstr *);
-extern int shp_hardtarget(struct shpstr *);
-extern int shp_nav_one_sector(struct emp_qelem *, int, natid, int);
-extern int shp_missile_defense(coord, coord, natid, int);
-extern void shp_missdef(struct shpstr *, natid);
-extern double shp_mobcost(struct shpstr *);
-extern void shp_set_tech(struct shpstr *, int);
+/* in ship.h */
 /* snxtitem.c */
 /* snxtsct.c */
 /* in nsc.h */
diff --git a/include/ship.h b/include/ship.h
index 1d9d339be..30dd8a2ac 100644
--- a/include/ship.h
+++ b/include/ship.h
@@ -187,4 +187,17 @@ extern double shp_fire_range(struct shpstr *);
 extern int shp_usable_guns(struct shpstr *);
 extern double shp_torp_hitchance(struct shpstr *, int);
 
+/* src/lib/subs/shpsub.c */
+extern void shp_sel(struct nstr_item *, struct emp_qelem *);
+extern void shp_nav(struct emp_qelem *, double *, double *, int *, natid);
+extern int shp_sweep(struct emp_qelem *, int, int, natid);
+extern int shp_check_nav(struct sctstr *, struct shpstr *);
+extern int sect_has_dock(struct sctstr *);
+extern int shp_hardtarget(struct shpstr *);
+extern int shp_nav_one_sector(struct emp_qelem *, int, natid, int);
+extern int shp_missile_defense(coord, coord, natid, int);
+extern void shp_missdef(struct shpstr *, natid);
+extern double shp_mobcost(struct shpstr *);
+extern void shp_set_tech(struct shpstr *, int);
+
 #endif