From 5d7f0119007544714519caa8e320c7f8d8e7c8ad Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 13 Jan 2013 15:04:24 +0100 Subject: [PATCH] Use int instead of long to count people Code dealing with counting people mixes int and long pretty haphazardly. Harmless, because practical populations fit into int easily on any machine capable of running the server. Clean up anyway. --- include/budg.h | 6 +++--- include/prototypes.h | 2 +- src/lib/commands/budg.c | 4 ++-- src/lib/update/main.c | 6 +++--- src/lib/update/nat.c | 4 ++-- src/lib/update/prepare.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/budg.h b/include/budg.h index b7dd43609..be130cd49 100644 --- a/include/budg.h +++ b/include/budg.h @@ -28,7 +28,7 @@ * * Known contributors to this file: * Ville Virrankoski, 1995 - * Markus Armbruster, 2004-2009 + * Markus Armbruster, 2004-2013 */ #ifndef BUDG_H @@ -52,11 +52,11 @@ void bp_put_avail(struct bp *, struct sctstr *, int); int get_materials(struct sctstr *, struct bp *, int *, int); extern long money[MAXNOC]; -extern long pops[MAXNOC]; +extern int pops[MAXNOC]; extern long sea_money[MAXNOC]; extern long lnd_money[MAXNOC]; extern long air_money[MAXNOC]; -extern long tpops[MAXNOC]; +extern int tpops[MAXNOC]; extern float levels[MAXNOC][4]; #endif diff --git a/include/prototypes.h b/include/prototypes.h index 5514d3ab8..8d4866663 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -708,7 +708,7 @@ extern int prod_plane(int, int, struct bp *, int); 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, long *, int *, +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 *); diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index c802080bd..df2b9d381 100644 --- a/src/lib/commands/budg.c +++ b/src/lib/commands/budg.c @@ -30,7 +30,7 @@ * Thomas Ruschak, 1992 * Ville Virrankoski, 1995 * Steve McClure, 1997-2000 - * Markus Armbruster, 2004-2009 + * Markus Armbruster, 2004-2013 */ #include @@ -180,7 +180,7 @@ calc_all(long p_sect[][2], { struct natstr *np; struct bp *bp; - long pop = 0; + int pop = 0; int n, civ_tax, uw_tax, mil_pay; struct sctstr *sp; int etu = etu_per_update; diff --git a/src/lib/update/main.c b/src/lib/update/main.c index 1123620af..7f1d026f4 100644 --- a/src/lib/update/main.c +++ b/src/lib/update/main.c @@ -30,7 +30,7 @@ * Dave Pare, 1994 * Steve McClure, 1996 * Doug Hay, 1998 - * Markus Armbruster, 2006-2011 + * Markus Armbruster, 2006-2013 */ #include @@ -45,11 +45,11 @@ #include "update.h" long money[MAXNOC]; -long pops[MAXNOC]; +int pops[MAXNOC]; long sea_money[MAXNOC]; long lnd_money[MAXNOC]; long air_money[MAXNOC]; -long tpops[MAXNOC]; +int tpops[MAXNOC]; void update_main(void) diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c index 38727d7d2..e735db3fb 100644 --- a/src/lib/update/nat.c +++ b/src/lib/update/nat.c @@ -122,7 +122,7 @@ prod_nat(int etu) float hap; float edu; float hap_edu; - long pop; + int pop; double rlev; double tlev; double tech[MAXNOC]; @@ -173,7 +173,7 @@ prod_nat(int etu) limit_level(levels[n][NAT_TLEV] / 1, NAT_TLEV, 0) * 1; levels[n][NAT_RLEV] = limit_level(levels[n][NAT_RLEV] / 1, NAT_RLEV, 0) * 1; - wu(0, n, "total pop was %ld, yielding %4.2f hap, %4.2f edu\n", + wu(0, n, "total pop was %d, yielding %4.2f hap, %4.2f edu\n", pop - 1, hap, edu); } if (ally_factor > 0.0) diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c index 3b307261a..935aacd02 100644 --- a/src/lib/update/prepare.c +++ b/src/lib/update/prepare.c @@ -94,7 +94,7 @@ prepare_sects(int etu, struct bp *bp) } void -tax(struct sctstr *sp, struct natstr *np, int etu, long *pop, int *civ_tax, +tax(struct sctstr *sp, struct natstr *np, int etu, int *pop, int *civ_tax, int *uw_tax, int *mil_pay) { *civ_tax = 0; -- 2.43.0