Merge branch 'readline'

[empserver] / include / prototypes.h

diff --git a/include/prototypes.h b/include/prototypes.h
index 3d320fa52f6556c4cfb93daac2a28e02eda33217..ec89b40df09d2435bf357e2bd653a8331e9735d7 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-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -59,18 +59,12 @@ extern int edit_sect_i(struct sctstr *, char *, int);
 extern int load_comm_ok(struct sctstr *, natid, i_type, int);
 extern void gift(natid, natid, void *, char *);
 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 *, int *, double *, double *);
-extern int count_pop(int);
-extern int scuttle_tradeship(struct shpstr *, 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 void trdswitchown(int, struct empobj *, int);
 extern int do_look(int);
 extern void look_at_sect(struct sctstr *, int);
 extern int radar(int);
@@ -124,7 +118,6 @@ int fina(void);
 int flash(void);
 int flee(void);
 int fly(void);
-int foll(void);
 int force(void);
 int fort(void);
 int give(void);
@@ -155,7 +148,6 @@ int march(void);
 int mark(void);
 int mine(void);
 int mission(void);
-int mobq(void);
 int morale(void);
 int move(void);
 int multifire(void);
@@ -168,7 +160,6 @@ int newe(void);
 int news(void);
 int nuke(void);
 int offe(void);
-int orde(void);
 int orig(void);
 int para(void);
 int path(void);
@@ -181,7 +172,6 @@ int play(void);
 int powe(void);
 int prod(void);
 int pstat(void);
-int qorde(void);
 int quit(void);
 int rada(void);
 int range(void);
@@ -198,7 +188,6 @@ int reso(void);
 int retr(void);
 int rout(void);
 int sabo(void);
-int sail(void);
 int sate(void);
 int scra(void);
 int sct(void);
@@ -218,7 +207,6 @@ int shut(void);
 int sinfra(void);
 int skyw(void);
 int sona(void);
-int sorde(void);
 int spy(void);
 int sstat(void);
 int start(void);
@@ -237,7 +225,6 @@ int togg(void);
 int torp(void);
 int trad(void);
 int tran(void);
-int trea(void);
 int turn(void);
 int upda(void);
 int upgr(void);
@@ -247,7 +234,6 @@ int wing(void);
 int wipe(void);
 int work(void);
 int xdump(void);
-int xedit(void);
 int zdon(void);
 
 /*
@@ -281,6 +267,7 @@ extern int read_schedule(char *, time_t[], int, time_t, time_t);
 /* res_pop.c */
 extern int max_population(float, int, int);
 extern int max_pop(float, struct sctstr *);
+extern int max_workers(float, struct sctstr *);
 /* stmtch.c */
 /* in match.h */
 /* type.c */
@@ -298,8 +285,7 @@ extern int demandupdatecheck(void);
 /* disassoc.c */
 extern int disassoc(void);
 /* fnameat.c */
-extern char *fnameat(const char *, const char *);
-extern FILE *fopenat(const char *, const char *, const char *);
+/* in fnameat.h */
 /* fsize.c */
 extern int fsize(int);
 extern int blksize(int);
@@ -412,7 +398,10 @@ extern int check_trade_ok(struct trdstr *);
 /* coastal.c */
 extern void set_coastal(struct sctstr *, int, int);
 /* control.c */
+extern double security_strength(struct sctstr *, int *);
 extern int military_control(struct sctstr *);
+extern int abandon_askyn(struct sctstr *, i_type, int, struct ulist *);
+extern int would_abandon(struct sctstr *, i_type, int, struct ulist *);
 /* damage.c */
 extern void landdamage(struct lndstr *, int);
 extern void ship_damage(struct shpstr *, int);
@@ -428,8 +417,6 @@ extern int commdamage(int, int, i_type);
 extern int detonate(struct nukstr *, coord, coord, int);
 /* disloan.c */
 extern int disloan(int, struct lonstr *);
-/* distrea.c */
-extern int distrea(int, struct trtstr *);
 /* fileinit.c */
 extern void ef_init_srv(int);
 extern void ef_fin_srv(void);
@@ -459,9 +446,9 @@ extern int unitsatxy(coord, coord, int, int);
 extern int planesatxy(coord, coord, int, int);
 extern int asw_shipsatxy(coord, coord, int, int, struct plnstr *,
                         struct shiplist **);
-extern int has_units(coord, coord, natid, struct lndstr *);
+extern void print_shiplist(struct shiplist *);
+extern int has_units(coord, coord, natid);
 extern int adj_units(coord, coord, natid);
-extern int islist(char *);
 /* maps.c */
 /* in map.h */
 /* mission.c */
@@ -541,7 +528,7 @@ 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 *, char, int);
+extern int pln_damage(struct plnstr *, char, char *);
 extern int pln_identchance(struct plnstr *, int, int);
 extern int pln_is_in_orbit(struct plnstr *);
 extern void pln_set_tech(struct plnstr *, int);
@@ -575,14 +562,9 @@ extern int delty(struct range *, coord);
 extern void radmap(int, int, int, double, int, double);
 extern void rad_map_set(natid, int, int, int, double, int);
 /* rej.c */
-extern void setrel(natid, natid, int);
-extern void setcont(natid, natid, int);
-extern void setrej(natid, natid, int, int);
+/* in nat.h */
 /* retreat.c */
-extern void retreat_ship(struct shpstr *, char);
-extern void retreat_land(struct lndstr *, char);
-extern int check_retreat_and_do_shipdamage(struct shpstr *, int);
-extern int check_retreat_and_do_landdamage(struct lndstr *, int);
+/* in retreat.h */
 /* sarg.c */
 extern enum ns_seltype sarg_type(char *);
 extern int sarg_xy(char *, coord *, coord *);
@@ -647,8 +629,6 @@ extern void takeover_ship(struct shpstr *, natid);
 extern void takeover_plane(struct plnstr *, natid);
 /* trdsub.c */
 /* in trade.h */
-/* trechk.c */
-extern int trechk(natid, natid, int);
 /* whatitem.c */
 /* in item.h */
 /* wu.c */
@@ -659,85 +639,7 @@ extern int wu(natid, natid, char *, ...) ATTRIBUTE((format (printf, 3, 4)));
 /*
  * src/lib/update/ *.c
  */
-/* age.c */
-extern int age_people(int, int);
-extern void age_levels(int);
-/* anno.c */
-extern void delete_old_announcements(void);
-/* bp.c */
-/* in budg.h */
-/* deliver.c */
-extern void dodeliver(struct sctstr *);
-/* distribute.c */
-extern int dodistribute(struct sctstr *, int, double);
-/* finish.c */
-extern void finish_sects(int);
-/* human.c */
-extern int new_work(struct sctstr *, int);
-extern int do_feed(struct sctstr *, struct natstr *, short *, int *, int);
-extern int feed_people(short *, int);
-extern double food_needed(short *, int);
-extern int famine_victims(short *, int);
-/* land.c */
-extern int prod_land(int, int, struct bp *, int);
-/* main.c */
-/* in server.h */
-/* material.c */
-/* in budg.h */
-/* mobility.c */
-extern void mob_sect(void);
-extern void mob_ship(void);
-extern void mob_land(void);
-extern void mob_plane(void);
-extern void sct_do_upd_mob(struct sctstr *sp);
-extern void shp_do_upd_mob(struct shpstr *sp);
-extern void lnd_do_upd_mob(struct lndstr *lp);
-extern void pln_do_upd_mob(struct plnstr *pp);
-/* move_sat.c */
-extern void move_sat(struct plnstr *);
-/* nat.c */
-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 void unload_it(struct shpstr *);
-/* nxtitemp.c */
-/* in nsc.h */
-/* plague.c */
-extern void do_plague(struct sctstr *, struct natstr *, int);
-extern int plague_people(struct natstr *, short *, int *, int *, int);
-/* plane.c */
-extern int prod_plane(int, int, struct bp *, int);
-/* populace.c */
-extern void populace(struct natstr *, struct sctstr *, int);
-extern int total_work(int, int, int, int, int, int);
-/* prepare.c */
-extern void tax(struct sctstr *, struct natstr *, int, int *, int *,
-               int *, int *);
-extern int upd_slmilcosts(natid, int);
-extern void prepare_sects(int, struct bp *);
-extern int bank_income(struct sctstr *, int);
-/* produce.c */
-extern int produce(struct natstr *, struct sctstr *, short *, int, int,
-                  int, int *, int *);
-extern int prod_materials_cost(struct pchrstr *, short[], int *);
-extern int prod_resource_limit(struct pchrstr *, unsigned char *);
-extern double prod_eff(int, float);
-/* removewants.c */
-extern int update_removewants(void);
-/* revolt.c */
-extern void revolt(struct sctstr *);
-extern void guerrilla(struct sctstr *);
-/* sail.c */
-extern void sail_ship(natid);
-/* sect.c */
-extern void do_fallout(struct sctstr *, int);
-extern void spread_fallout(struct sctstr *, int);
-extern void decay_fallout(struct sctstr *, int);
-extern void produce_sect(int, int, struct bp *, int[][2]);
-/* ship.c */
-extern int prod_ship(int, int, struct bp *, int);
+/* in update.h */
 
 /*
  * src/server