Remove dodistribute() parameter path

[empserver] / include / prototypes.h

diff --git a/include/prototypes.h b/include/prototypes.h
index 9cc98f7aa48dc1be2542295dfb0ff14637ffda01..3c0748b558f0bb8a2e917e65547bd8fa461ac10b 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -62,20 +62,19 @@ extern int display_mark(i_type, int);
 extern int want_to_abandon(struct sctstr *, i_type, int, struct lndstr *);
 extern int would_abandon(struct sctstr *, i_type, int, struct lndstr *);
 extern int nav_map(int, int, int);
-extern int do_unit_move(struct emp_qelem *land_list, int *together,
-            double *minmob, double *maxmob);
+extern int do_unit_move(struct emp_qelem *, int *, double *, double *);
 extern int count_pop(int);
 extern int scuttle_tradeship(struct shpstr *, int);
-extern void resnoise(struct sctstr *sptr, int public_amt, char *name,
-                    int old, int new);
+extern void resnoise(struct sctstr *, int, char *, int, int);
 extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
 extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **);
 extern char *prsub(struct shpstr *);
 extern int check_trade(void);
 extern int ontradingblock(int, void *);
 extern void trdswitchown(int, void *, int);
-extern int do_look(short);
-extern int radar(short);
+extern int do_look(int);
+extern void look_at_sect(struct sctstr *, int);
+extern int radar(int);
 extern void update_power(void);
 extern int show_first_tel(char *);
 /* Commands */
@@ -256,7 +255,7 @@ int zdon(void);
  * src/lib/common/ *.c
  */
 /* bestpath.c */
-extern char *bestownedpath(char *, char *, int, int, int, int, int);
+/* in path.h */
 /* conftab.c */
 extern int read_builtin_tables(void);
 extern int read_custom_tables(void);
@@ -280,24 +279,13 @@ extern int logreopen(void);
 extern void logerror(char *, ...) ATTRIBUTE((format (printf, 1, 2)));
 /* more in misc.h */
 /* mapdist.c */
-extern int deltax(int, int);
-extern int deltay(int, int);
 extern int mapdist(int, int, int, int);
 /* move.c */
 /* in path.h */
 /* nstreval.c */
 /* in nsc.h */
 /* path.c */
-extern void bp_enable_cachepath(void);
-extern void bp_disable_cachepath(void);
-extern void bp_clear_cachepath(void);
-extern char *BestDistPath(char *, struct sctstr *, struct sctstr *,
-                         double *);
-extern char *BestLandPath(char *, struct sctstr *, struct sctstr *,
-                         double *, int);
-extern char *BestShipPath(char *, int, int, int, int, int);
-extern char *BestAirPath(char *, int, int, int, int);
-extern double pathcost(struct sctstr *, char *, int);
+/* in path.h */
 /* rdsched.c */
 extern int read_schedule(char *, time_t[], int, time_t, time_t);
 /* res_pop.c */
@@ -340,8 +328,6 @@ extern char *numstr(char buf[], int n);
 extern char *esplur(int n);
 extern char *splur(int n);
 extern char *iesplur(int n);
-extern char *plurize(char *buf, int max_len, int n);
-/* more in misc.h */
 
 /*
  * src/lib/global/ *.c
@@ -379,7 +365,7 @@ extern int player_set_nstat(struct player *, struct natstr *);
 extern void player_login(void *);
 /* nat.c */
 extern int natbyname(char *, natid *);
-extern int natpass(int, char *);
+extern int natpass(natid, char *);
 /* player.c */
 extern struct player *player;  /* current player's context */
 extern char *praddr(struct player *);
@@ -442,6 +428,7 @@ extern void ef_fin_srv(void);
 extern int sd(natid, natid, coord, coord, int, int, int);
 extern int dd(natid, natid, coord, coord, int, int);
 extern int shipdef(natid, natid, coord, coord);
+extern int feels_like_helping(natid, natid, natid);
 /* getbit.c */
 extern int emp_getbit(int, int, unsigned char *);
 extern void emp_setbit(int, int, unsigned char *);
@@ -454,9 +441,6 @@ extern void lnd_oninit(void *);
 extern void lnd_postread(int, void *);
 extern void lnd_prewrite(int, void *, void *);
 /* landgun.c */
-extern double seagun(int, int);
-extern double fortgun(int, int);
-extern double landunitgun(int, int);
 extern double torprange(struct shpstr *);
 extern double fortrange(struct sctstr *);
 extern int roundrange(double);
@@ -477,9 +461,9 @@ extern int display_region_map(int bmap, int unit_type, coord curx,
 extern int bmaps_intersect(natid, natid);
 extern int share_bmap(natid, natid, struct nstr_sect *, char, char *);
 /* mission.c */
-extern char *mission_name(short);
+extern char *mission_name(int);
 extern int collateral_damage(coord, coord, int);
-extern int mission_pln_equip(struct plist *, struct ichrstr *, int, char);
+extern int mission_pln_equip(struct plist *, struct ichrstr *, char);
 extern int ground_interdict(coord, coord, natid, char *);
 extern int unit_interdict(coord, coord, natid, char *, int, int);
 extern int off_support(coord, coord, natid, natid);
@@ -495,14 +479,13 @@ extern int move_ground(struct sctstr *, struct sctstr *,
                       int, int *);
 extern int fly_map(coord, coord);
 /* mslsub.c */
-extern int msl_intercept(coord, coord, natid, int, int, int, int);
-extern int msl_equip(struct plnstr *, char);
-extern int msl_hit(struct plnstr *, int, int, int, int, char *,
-                  coord, coord, int);
+extern int msl_launch(struct plnstr *, int, char *, coord, coord, natid,
+                     int *);
+extern int msl_hit(struct plnstr *, int, int, int, int, int, natid);
 extern void msl_sel(struct emp_qelem *, coord, coord, natid, int,
                    int, int);
-extern int msl_launch_mindam(struct emp_qelem *, coord, coord, int,
-                            int, int, char *, int, int);
+extern int msl_abm_intercept(struct plnstr *, coord, coord, int);
+extern int msl_asat_intercept(struct plnstr *, coord, coord);
 /* mtch.c */
 extern int comtch(char *, struct cmndstr *, int);
 /* natarg.c */
@@ -550,14 +533,15 @@ extern int pln_airbase_ok(struct plnstr *, int, int);
 extern int carrier_planes(struct shpstr *, int);
 extern void pln_sel(struct nstr_item *, struct emp_qelem *,
                    struct sctstr *, int, int, int, int);
-extern void pln_arm(struct emp_qelem *, int, char, struct ichrstr *, int);
-extern int pln_mobcost(int, struct plnstr *, int);
+extern void pln_arm(struct emp_qelem *, int, char, struct ichrstr *);
+extern int pln_equip(struct plist *, struct ichrstr *, char);
+extern int pln_mobcost(int, struct plnstr *, char);
 extern void pln_put(struct emp_qelem *);
 extern void pln_put1(struct plist *);
 extern void plane_sweep(struct emp_qelem *, coord, coord);
 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);
+extern int pln_damage(struct plnstr *, char, int);
 extern int pln_identchance(struct plnstr *, int, int);
 extern int pln_is_in_orbit(struct plnstr *);
 extern void pln_set_tech(struct plnstr *, int);
@@ -578,9 +562,7 @@ extern void prprompt(int min, int btu);
 extern int prmptrd(char *prompt, char *str, int size);
 extern int uprmptrd(char *prompt, char *str, int size);
 extern void prdate(void);
-extern void prxy(char *format, coord x, coord y, natid country);
-extern void PR(int, char *, ...) ATTRIBUTE((format (printf, 2, 3)));
-extern void PRdate(natid cn);
+extern void prxy(char *, coord, coord);
 extern void pr_beep(void);
 extern void mpr(int, char *, ...) ATTRIBUTE((format (printf, 2, 3)));
 extern size_t copy_ascii_no_funny(char *, char *);
@@ -591,13 +573,12 @@ extern int ufindpfx(char *, int);
 /* radmap.c */
 extern int deltx(struct range *, coord);
 extern int delty(struct range *, coord);
-extern void radmap(int, int, int, int, double);
-extern void radmapnopr(int, int, int, int, double);
-extern void radmapupd(int, int, int, int, int, double);
+extern void radmap(int, int, int, double, int, double);
+extern void rad_map_set(natid, int, int, int, double, int);
 /* rej.c */
-extern int setrel(natid, natid, int);
-extern int setcont(natid, natid, int);
-extern int setrej(natid, natid, int, int);
+extern void setrel(natid, natid, int);
+extern void setcont(natid, natid, int);
+extern void setrej(natid, natid, int, int);
 /* retreat.c */
 extern void retreat_ship(struct shpstr *, char);
 extern void retreat_land(struct lndstr *, char);
@@ -662,8 +643,7 @@ extern double shp_mobcost(struct shpstr *);
 extern void shp_set_tech(struct shpstr *, int);
 /* snxtitem.c */
 extern int snxtitem(struct nstr_item *, int, char *, char *);
-extern void snxtitem_area(struct nstr_item *, int,
-                         struct range *);
+extern void snxtitem_area(struct nstr_item *, int, struct range *);
 extern void snxtitem_dist(struct nstr_item *, int, int, int, int);
 extern void snxtitem_xy(struct nstr_item *, int, coord, coord);
 extern void snxtitem_all(struct nstr_item *, int);
@@ -714,7 +694,7 @@ extern void delete_old_announcements(void);
 /* deliver.c */
 extern void dodeliver(struct sctstr *);
 /* distribute.c */
-extern int dodistribute(struct sctstr *, int, char *, double, double);
+extern int dodistribute(struct sctstr *, int, double, double);
 /* finish.c */
 extern void finish_sects(int);
 /* human.c */
@@ -745,8 +725,7 @@ extern void prod_nat(int);
 /* nav_ship.c */
 extern int nav_ship(struct shpstr *);
 /* nav_util.c */
-extern int load_it(struct shpstr *, struct sctstr *,
-                  int);
+extern int load_it(struct shpstr *, struct sctstr *, int);
 extern void unload_it(struct shpstr *);
 /* nxtitemp.c */
 extern void *nxtitemp(struct nstr_item *);