diff --git a/include/prototypes.h b/include/prototypes.h index 17aa5eb3..8359a610 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -648,7 +648,7 @@ extern void age_levels(int); /* anno.c */ extern void delete_old_announcements(void); /* bp.c */ -/* in budg.h */ +/* in update.h */ /* deliver.c */ extern void dodeliver(struct sctstr *); /* distribute.c */ diff --git a/include/budg.h b/include/update.h similarity index 93% rename from include/budg.h rename to include/update.h index a8aef7c3..41eab377 100644 --- a/include/budg.h +++ b/include/update.h @@ -24,18 +24,17 @@ * * --- * - * budg.h: Budget related definitions + * update.h: Definitions related to the update * * Known contributors to this file: * Ville Virrankoski, 1995 * Markus Armbruster, 2004-2016 */ -#ifndef BUDG_H -#define BUDG_H +#ifndef UPDATE_H +#define UPDATE_H -#include "types.h" -#include "item.h" +#include "sect.h" #define SCT_EFFIC (SCT_TYPE_MAX + 1) #define SCT_MAINT (SCT_TYPE_MAX + 2) diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index 7b205b3e..11c59825 100644 --- a/src/lib/commands/budg.c +++ b/src/lib/commands/budg.c @@ -36,11 +36,11 @@ #include #include -#include "budg.h" #include "commands.h" #include "item.h" #include "optlist.h" #include "product.h" +#include "update.h" static void calc_all(int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, int *bars, int *Nbars, int *mil, diff --git a/src/lib/update/bp.c b/src/lib/update/bp.c index 86991129..b2dcf941 100644 --- a/src/lib/update/bp.c +++ b/src/lib/update/bp.c @@ -41,9 +41,8 @@ #include #include -#include "budg.h" #include "optlist.h" -#include "sect.h" +#include "update.h" /* Item types we want to track. */ enum bp_item_idx { diff --git a/src/lib/update/land.c b/src/lib/update/land.c index 0bb5c00e..c2eaaad1 100644 --- a/src/lib/update/land.c +++ b/src/lib/update/land.c @@ -36,7 +36,6 @@ #include #include -#include "budg.h" #include "chance.h" #include "file.h" #include "land.h" @@ -47,7 +46,7 @@ #include "plague.h" #include "player.h" #include "prototypes.h" -#include "sect.h" +#include "update.h" static void landrepair(struct lndstr *, struct natstr *, struct bp *, int); static void upd_land(struct lndstr *, int, struct natstr *, struct bp *, int); diff --git a/src/lib/update/main.c b/src/lib/update/main.c index f6ed8cd5..2ea9aef2 100644 --- a/src/lib/update/main.c +++ b/src/lib/update/main.c @@ -36,7 +36,6 @@ #include #include -#include "budg.h" #include "empthread.h" #include "file.h" #include "game.h" @@ -45,6 +44,7 @@ #include "prototypes.h" #include "server.h" #include "unit.h" +#include "update.h" int money[MAXNOC]; int pops[MAXNOC]; diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c index ec31dec2..b0292420 100644 --- a/src/lib/update/nat.c +++ b/src/lib/update/nat.c @@ -35,13 +35,13 @@ #include #include -#include "budg.h" #include "file.h" #include "game.h" #include "item.h" #include "optlist.h" #include "prototypes.h" #include "nat.h" +#include "update.h" /* * hap and edu avg mean that the weight on current happiness is diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c index 7c80e342..2832c24c 100644 --- a/src/lib/update/plane.c +++ b/src/lib/update/plane.c @@ -34,7 +34,6 @@ #include -#include "budg.h" #include "chance.h" #include "file.h" #include "lost.h" @@ -43,8 +42,8 @@ #include "plane.h" #include "player.h" #include "prototypes.h" -#include "sect.h" #include "ship.h" +#include "update.h" static void planerepair(struct plnstr *, struct natstr *, struct bp *, int); static void upd_plane(struct plnstr *, int, struct natstr *, struct bp *, int); diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c index 3d6b6e68..6c0110cc 100644 --- a/src/lib/update/prepare.c +++ b/src/lib/update/prepare.c @@ -35,7 +35,6 @@ #include -#include "budg.h" #include "chance.h" #include "file.h" #include "item.h" @@ -44,8 +43,8 @@ #include "optlist.h" #include "player.h" #include "prototypes.h" -#include "sect.h" #include "ship.h" +#include "update.h" void prepare_sects(int etu) diff --git a/src/lib/update/produce.c b/src/lib/update/produce.c index a7d7bae9..cc67ece1 100644 --- a/src/lib/update/produce.c +++ b/src/lib/update/produce.c @@ -32,14 +32,13 @@ #include -#include "budg.h" #include "chance.h" #include "nat.h" #include "optlist.h" #include "player.h" #include "product.h" #include "prototypes.h" -#include "sect.h" +#include "update.h" static void materials_charge(struct pchrstr *, short *, int); diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c index 4412831c..ac0a818e 100644 --- a/src/lib/update/sect.c +++ b/src/lib/update/sect.c @@ -34,7 +34,6 @@ #include -#include "budg.h" #include "chance.h" #include "file.h" #include "item.h" @@ -45,8 +44,8 @@ #include "path.h" #include "player.h" #include "prototypes.h" -#include "sect.h" #include "ship.h" +#include "update.h" double buildeff(struct sctstr *sp) diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c index e2d5213b..01fb8c9f 100644 --- a/src/lib/update/ship.c +++ b/src/lib/update/ship.c @@ -36,7 +36,6 @@ #include #include -#include "budg.h" #include "chance.h" #include "file.h" #include "land.h" @@ -48,8 +47,8 @@ #include "player.h" #include "product.h" #include "prototypes.h" -#include "sect.h" #include "ship.h" +#include "update.h" static void shiprepair(struct shpstr *, struct natstr *, struct bp *, int); static void upd_ship(struct shpstr *, int, struct natstr *, struct bp *, int);