empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

include: Rename budg.h to update.h

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-18 13:26:02 +02:00
parent c7000117e8
commit 2e7efd1e9b
12 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -648,7 +648,7 @@ extern void age_levels(int);
/* anno.c */ /* anno.c */
extern void delete_old_announcements(void); extern void delete_old_announcements(void);
/* bp.c */ /* bp.c */
/* in budg.h */ /* in update.h */
/* deliver.c */ /* deliver.c */
extern void dodeliver(struct sctstr *); extern void dodeliver(struct sctstr *);
/* distribute.c */ /* distribute.c */

9
include/budg.h → include/update.h
View file

@ -24,18 +24,17 @@
* *
* --- * ---
* *
* budg.h: Budget related definitions * update.h: Definitions related to the update
* *
* Known contributors to this file: * Known contributors to this file:
* Ville Virrankoski, 1995 * Ville Virrankoski, 1995
* Markus Armbruster, 2004-2016 * Markus Armbruster, 2004-2016
*/ */
#ifndef BUDG_H #ifndef UPDATE_H
#define BUDG_H #define UPDATE_H
#include "types.h" #include "sect.h"
#include "item.h"
#define SCT_EFFIC (SCT_TYPE_MAX + 1) #define SCT_EFFIC (SCT_TYPE_MAX + 1)
#define SCT_MAINT (SCT_TYPE_MAX + 2) #define SCT_MAINT (SCT_TYPE_MAX + 2)

2
src/lib/commands/budg.c
View file

@ -36,11 +36,11 @@
#include <config.h> #include <config.h>
#include <ctype.h> #include <ctype.h>
#include "budg.h"
#include "commands.h" #include "commands.h"
#include "item.h" #include "item.h"
#include "optlist.h" #include "optlist.h"
#include "product.h" #include "product.h"
#include "update.h"
static void calc_all(int (*p_sect)[2], int *taxes, int *Ncivs, static void calc_all(int (*p_sect)[2], int *taxes, int *Ncivs,
int *Nuws, int *bars, int *Nbars, int *mil, int *Nuws, int *bars, int *Nbars, int *mil,

3
src/lib/update/bp.c
View file

@ -41,9 +41,8 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include "budg.h"
#include "optlist.h" #include "optlist.h"
#include "sect.h" #include "update.h"
/* Item types we want to track. */ /* Item types we want to track. */
enum bp_item_idx { enum bp_item_idx {

3
src/lib/update/land.c
View file

@ -36,7 +36,6 @@
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>
#include "budg.h"
#include "chance.h" #include "chance.h"
#include "file.h" #include "file.h"
#include "land.h" #include "land.h"
@ -47,7 +46,7 @@
#include "plague.h" #include "plague.h"
#include "player.h" #include "player.h"
#include "prototypes.h" #include "prototypes.h"
#include "sect.h" #include "update.h"
static void landrepair(struct lndstr *, struct natstr *, struct bp *, int); static void landrepair(struct lndstr *, struct natstr *, struct bp *, int);
static void upd_land(struct lndstr *, int, struct natstr *, struct bp *, int); static void upd_land(struct lndstr *, int, struct natstr *, struct bp *, int);

2
src/lib/update/main.c
View file

@ -36,7 +36,6 @@
#include <config.h> #include <config.h>
#include <sys/resource.h> #include <sys/resource.h>
#include "budg.h"
#include "empthread.h" #include "empthread.h"
#include "file.h" #include "file.h"
#include "game.h" #include "game.h"
@ -45,6 +44,7 @@
#include "prototypes.h" #include "prototypes.h"
#include "server.h" #include "server.h"
#include "unit.h" #include "unit.h"
#include "update.h"
int money[MAXNOC]; int money[MAXNOC];
int pops[MAXNOC]; int pops[MAXNOC];

2
src/lib/update/nat.c
View file

@ -35,13 +35,13 @@
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>
#include "budg.h"
#include "file.h" #include "file.h"
#include "game.h" #include "game.h"
#include "item.h" #include "item.h"
#include "optlist.h" #include "optlist.h"
#include "prototypes.h" #include "prototypes.h"
#include "nat.h" #include "nat.h"
#include "update.h"
/* /*
* hap and edu avg mean that the weight on current happiness is * hap and edu avg mean that the weight on current happiness is

3
src/lib/update/plane.c
View file

@ -34,7 +34,6 @@
#include <config.h> #include <config.h>
#include "budg.h"
#include "chance.h" #include "chance.h"
#include "file.h" #include "file.h"
#include "lost.h" #include "lost.h"
@ -43,8 +42,8 @@
#include "plane.h" #include "plane.h"
#include "player.h" #include "player.h"
#include "prototypes.h" #include "prototypes.h"
#include "sect.h"
#include "ship.h" #include "ship.h"
#include "update.h"
static void planerepair(struct plnstr *, struct natstr *, struct bp *, int); static void planerepair(struct plnstr *, struct natstr *, struct bp *, int);
static void upd_plane(struct plnstr *, int, struct natstr *, struct bp *, int); static void upd_plane(struct plnstr *, int, struct natstr *, struct bp *, int);

3
src/lib/update/prepare.c
View file

@ -35,7 +35,6 @@
#include <config.h> #include <config.h>
#include "budg.h"
#include "chance.h" #include "chance.h"
#include "file.h" #include "file.h"
#include "item.h" #include "item.h"
@ -44,8 +43,8 @@
#include "optlist.h" #include "optlist.h"
#include "player.h" #include "player.h"
#include "prototypes.h" #include "prototypes.h"
#include "sect.h"
#include "ship.h" #include "ship.h"
#include "update.h"
void void
prepare_sects(int etu) prepare_sects(int etu)

3
src/lib/update/produce.c
View file

@ -32,14 +32,13 @@
#include <config.h> #include <config.h>
#include "budg.h"
#include "chance.h" #include "chance.h"
#include "nat.h" #include "nat.h"
#include "optlist.h" #include "optlist.h"
#include "player.h" #include "player.h"
#include "product.h" #include "product.h"
#include "prototypes.h" #include "prototypes.h"
#include "sect.h" #include "update.h"
static void materials_charge(struct pchrstr *, short *, int); static void materials_charge(struct pchrstr *, short *, int);

3
src/lib/update/sect.c
View file

@ -34,7 +34,6 @@
#include <config.h> #include <config.h>
#include "budg.h"
#include "chance.h" #include "chance.h"
#include "file.h" #include "file.h"
#include "item.h" #include "item.h"
@ -45,8 +44,8 @@
#include "path.h" #include "path.h"
#include "player.h" #include "player.h"
#include "prototypes.h" #include "prototypes.h"
#include "sect.h"
#include "ship.h" #include "ship.h"
#include "update.h"
double double
buildeff(struct sctstr *sp) buildeff(struct sctstr *sp)

3
src/lib/update/ship.c
View file

@ -36,7 +36,6 @@
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>
#include "budg.h"
#include "chance.h" #include "chance.h"
#include "file.h" #include "file.h"
#include "land.h" #include "land.h"
@ -48,8 +47,8 @@
#include "player.h" #include "player.h"
#include "product.h" #include "product.h"
#include "prototypes.h" #include "prototypes.h"
#include "sect.h"
#include "ship.h" #include "ship.h"
#include "update.h"
static void shiprepair(struct shpstr *, struct natstr *, struct bp *, int); static void shiprepair(struct shpstr *, struct natstr *, struct bp *, int);
static void upd_ship(struct shpstr *, int, struct natstr *, struct bp *, int); static void upd_ship(struct shpstr *, int, struct natstr *, struct bp *, int);