Fix trailing whitespace

[empserver] / include / prototypes.h

diff --git a/include/prototypes.h b/include/prototypes.h
index 7cb9bd305de289eeef663d0ede3547d2c5012983..ca671226a1e0a7460e6a06d7322b77327cb5feef 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -26,7 +26,7 @@
  *  ---
  *
  *  prototypes.h: Prototypes for server functions
- * 
+ *
  *  Known contributors to this file:
  *     Curtis Larsen, 1998
  *     Steve McClure, 1998,2000
@@ -54,7 +54,7 @@ extern void finish_server(void);
 /* in empthread.h */
 
 /*
- * src/lib/commands/ *.c 
+ * src/lib/commands/ *.c
  */
 extern int check_market(void);
 extern void gift(natid, natid, void *, char *);
@@ -66,7 +66,6 @@ extern int do_unit_move(struct emp_qelem *land_list, int *together,
             double *minmob, double *maxmob);
 extern int count_pop(int);
 extern int scuttle_tradeship(struct shpstr *, int);
-extern void scuttle_ship(struct shpstr *);
 extern void resnoise(struct sctstr *sptr, int public_amt, char *name,
                     int old, int new);
 extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
@@ -254,7 +253,7 @@ int xedit(void);
 int zdon(void);
 
 /*
- * src/lib/common/ *.c 
+ * src/lib/common/ *.c
  */
 /* bestpath.c */
 extern char *bestownedpath(char *, char *, int, int, int, int, int);
@@ -316,7 +315,7 @@ extern int demandupdatecheck(void);
 /* in xdump.h */
 
 /*
- * src/lib/gen/ *.c 
+ * src/lib/gen/ *.c
  */
 /* fnameat.c */
 extern char *fnameat(const char *, const char *);
@@ -345,13 +344,13 @@ extern char *plurize(char *buf, int max_len, int n);
 /* more in misc.h */
 
 /*
- * src/lib/global/ *.c 
+ * src/lib/global/ *.c
  */
 extern void global_init(void);
 
 
 /*
- * src/lib/player/ *.c 
+ * src/lib/player/ *.c
  */
 /* accept.c */
 extern void player_init(void);
@@ -393,7 +392,7 @@ extern void stop_service(void);
 /* more in service.h */
 
 /*
- * src/lib/subs/ *.c 
+ * src/lib/subs/ *.c
  */
 /* askyn.c */
 extern int confirm(char *);
@@ -521,7 +520,6 @@ extern char *prnuke(struct nukstr *);
 extern void nuk_oninit(void *);
 extern void nuk_postread(int, void *);
 extern void nuk_prewrite(int, void *, void *);
-extern int nuk_on_plane(struct nukstr *, int);
 /* nxtitem.c */
 extern int nxtitem(struct nstr_item *, void *);
 /* nxtsct.c */
@@ -534,7 +532,6 @@ extern void pln_oninit(void *);
 extern void pln_postread(int, void *);
 extern void pln_prewrite(int, void *, void *);
 /* plnsub.c */
-extern void count_planes(struct shpstr *);
 extern int get_planes(struct nstr_item *, struct nstr_item *,
                      char *, char *);
 extern struct sctstr *get_assembly_point(char *, struct sctstr *, char *);
@@ -542,7 +539,8 @@ extern int pln_onewaymission(struct sctstr *, int *, int *);
 extern int pln_oneway_to_carrier_ok(struct emp_qelem *,
                                    struct emp_qelem *, int);
 extern void pln_newlanding(struct emp_qelem *, coord, coord, int);
-extern int could_be_on_ship(struct plnstr *, struct shpstr *);
+extern int could_be_on_ship(struct plnstr *, struct shpstr *,
+                           int, int, int, int);
 extern int put_plane_on_ship(struct plnstr *, struct shpstr *);
 extern void pln_dropoff(struct emp_qelem *, struct ichrstr *,
                        coord, coord, int);
@@ -557,10 +555,7 @@ extern int pln_arm(struct emp_qelem *, int, char, struct ichrstr *,
 extern int pln_mobcost(int, struct plnstr *, int);
 extern void pln_put(struct emp_qelem *);
 extern void pln_put1(struct plist *);
-extern void take_plane_off_ship(struct plnstr *, struct shpstr *);
-extern void take_plane_off_land(struct plnstr *, struct lndstr *);
 extern void plane_sweep(struct emp_qelem *, coord, coord);
-extern void count_land_planes(struct lndstr *);
 extern int put_plane_on_land(struct plnstr *, struct lndstr *);
 extern int pln_hitchance(struct plnstr *, int, int);
 extern int pln_damage(struct plnstr *, coord, coord, char, int *, int);
@@ -676,6 +671,7 @@ extern void snxtitem_all(struct nstr_item *, int);
 extern void snxtitem_group(struct nstr_item *, int, char);
 extern void snxtitem_rewind(struct nstr_item *);
 extern int snxtitem_list(struct nstr_item *, int, int *, int);
+extern void snxtitem_cargo(struct nstr_item *, int, int, int);
 /* snxtsct.c */
 extern int snxtsct(struct nstr_sect *, char *);
 extern void snxtsct_area(struct nstr_sect *, struct range *);
@@ -690,9 +686,9 @@ extern void resupply_commod(struct lndstr *, i_type);
 extern int supply_commod(int, int, int, i_type, int);
 extern int has_supply(struct lndstr *);
 /* takeover.c */
-extern void takeover_land(struct lndstr *, natid, int);
+extern void takeover_land(struct lndstr *, natid);
 extern void takeover(struct sctstr *, natid);
-extern void takeover_ship(struct shpstr *, natid, int);
+extern void takeover_ship(struct shpstr *, natid);
 extern void takeover_plane(struct plnstr *, natid);
 /* trdsub.c */
 /* trechk.c */
@@ -705,7 +701,7 @@ extern int typed_wu(natid, natid, char *, int);
 extern int wu(natid, natid, char *, ...) ATTRIBUTE((format (printf, 3, 4)));
 
 /*
- * src/lib/update/ *.c 
+ * src/lib/update/ *.c
  */
 /* age.c */
 extern void age_levels(int);