include: Rename budg.h to update.h

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

diff --git a/include/budg.h b/include/budg.h
deleted file mode 100644 (file)
index a8aef7c..0000000
--- a/include/budg.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  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
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  ---
- *
- *  See files README, COPYING and CREDITS in the root of the source
- *  tree for related information and legal notices.  It is expected
- *  that future projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  budg.h: Budget related definitions
- *
- *  Known contributors to this file:
- *     Ville Virrankoski, 1995
- *     Markus Armbruster, 2004-2016
- */
-
-#ifndef BUDG_H
-#define BUDG_H
-
-#include "types.h"
-#include "item.h"
-
-#define SCT_EFFIC (SCT_TYPE_MAX + 1)
-#define SCT_MAINT (SCT_TYPE_MAX + 2)
-#define SCT_BUDG_MAX SCT_MAINT
-
-struct bp *bp_alloc(void);
-void bp_set_from_sect(struct bp *, struct sctstr *);
-void bp_to_sect(struct bp *, struct sctstr *);
-
-extern int money[MAXNOC];
-extern int pops[MAXNOC];
-extern int sea_money[MAXNOC];
-extern int lnd_money[MAXNOC];
-extern int air_money[MAXNOC];
-extern int tpops[MAXNOC];
-extern float levels[MAXNOC][4];
-
-#endif

diff --git a/include/prototypes.h b/include/prototypes.h
index 17aa5eb3f7cd33c5f63dc5767e7c9cb7975d7ef0..8359a61089367a7fd539c02e065878be70914840 100644 (file)
--- 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/update.h b/include/update.h
new file mode 100644 (file)
index 0000000..41eab37
--- /dev/null
+++ b/include/update.h
@@ -0,0 +1,55 @@
+/*
+ *  Empire - A multi-player, client/server Internet based war game.
+ *  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
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  ---
+ *
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
+ *
+ *  ---
+ *
+ *  update.h: Definitions related to the update
+ *
+ *  Known contributors to this file:
+ *     Ville Virrankoski, 1995
+ *     Markus Armbruster, 2004-2016
+ */
+
+#ifndef UPDATE_H
+#define UPDATE_H
+
+#include "sect.h"
+
+#define SCT_EFFIC (SCT_TYPE_MAX + 1)
+#define SCT_MAINT (SCT_TYPE_MAX + 2)
+#define SCT_BUDG_MAX SCT_MAINT
+
+struct bp *bp_alloc(void);
+void bp_set_from_sect(struct bp *, struct sctstr *);
+void bp_to_sect(struct bp *, struct sctstr *);
+
+extern int money[MAXNOC];
+extern int pops[MAXNOC];
+extern int sea_money[MAXNOC];
+extern int lnd_money[MAXNOC];
+extern int air_money[MAXNOC];
+extern int tpops[MAXNOC];
+extern float levels[MAXNOC][4];
+
+#endif

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index 7b205b3e0ac09e78de1d79e11ec233705e03d125..11c59825a5033cb087f8b59a63eb0d4c9d9db111 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -36,11 +36,11 @@
 #include <config.h>
 
 #include <ctype.h>
-#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 86991129f5d9b0d2a903cf0797f284bc395b052e..b2dcf94112b42427a9f2c70ee1878972d91e4a2b 100644 (file)
--- a/src/lib/update/bp.c
+++ b/src/lib/update/bp.c
@@ -41,9 +41,8 @@
 #include <config.h>
 
 #include <stdlib.h>
-#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 0bb5c00ebea11630d1b9ab7b9fc9534f07ce327c..c2eaaad1c5d35157fad81c0b753e82bc5872a2d4 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -36,7 +36,6 @@
 #include <config.h>
 
 #include <math.h>
-#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 f6ed8cd59e649e2f447337032047d4819ccd3b24..2ea9aef2d1e87b5f7ad8d684857cb8091b914fab 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -36,7 +36,6 @@
 #include <config.h>
 
 #include <sys/resource.h>
-#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 ec31dec2eebbf1e8667b3c7d78bede952eeb91a9..b029242066da408449f562ed4dcc59cef5689ca2 100644 (file)
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -35,13 +35,13 @@
 #include <config.h>
 
 #include <math.h>
-#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 7c80e342bfa75c3955ac9a2ce5098789b60cf2dc..2832c24cd0e9aa1ad8f0174fa056defbe66e8a65 100644 (file)
--- a/src/lib/update/plane.c
+++ b/src/lib/update/plane.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#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 3d6b6e68c3c48c83c522da87c8a7f16a255c3072..6c0110cc2954ef0b3b2f44e62171b944a91490d9 100644 (file)
--- a/src/lib/update/prepare.c
+++ b/src/lib/update/prepare.c
@@ -35,7 +35,6 @@
 
 #include <config.h>
 
-#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 a7d7bae98b53ca8c7c14f1d9d726faa7783a6b8a..cc67ece18287dc297112700eeec76ce36807aeae 100644 (file)
--- a/src/lib/update/produce.c
+++ b/src/lib/update/produce.c
@@ -32,14 +32,13 @@
 
 #include <config.h>
 
-#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 4412831cb8b0b5e11c71f15b939a59f08fcd4a84..ac0a818e9e736848fbb9b7e70fd24c29c952ba82 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -34,7 +34,6 @@
 
 #include <config.h>
 
-#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 e2d5213b0de93c37f866a9912ec727e590ae3876..01fb8c9f19820c4f5779795986148e0edff9e8ad 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -36,7 +36,6 @@
 #include <config.h>
 
 #include <math.h>
-#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);