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

update: Give a few helpers internal linkage

Browse source 
External use of prod_materials_cost(), prod_resource_limit() went away
in commit 4a714a37d "production: Use update code instead of
duplicating it", v4.4.0.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2021-01-07 07:10:53 +01:00
parent 9e9355da41
commit 992ab36b59
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/update.h
View file

@ -140,8 +140,6 @@ extern void pay_reserve(struct natstr *, int);
/* produce.c */ /* produce.c */
extern void produce(struct natstr *, struct sctstr *); extern void produce(struct natstr *, struct sctstr *);
extern double prod_output(struct sctstr *, double); extern double prod_output(struct sctstr *, double);
extern double prod_materials_cost(struct pchrstr *, short[], int *);
extern double prod_resource_limit(struct pchrstr *, unsigned char *);
extern double prod_eff(int, float); extern double prod_eff(int, float);
/* removewants.c */ /* removewants.c */
extern int update_removewants(void); extern int update_removewants(void);

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

@ -27,7 +27,7 @@
* produce.c: Produce goodies * produce.c: Produce goodies
* *
* Known contributors to this file: * Known contributors to this file:
* Markus Armbruster, 2004-2016 * Markus Armbruster, 2004-2021
*/ */
#include <config.h> #include <config.h>
@ -41,7 +41,9 @@
#include "prototypes.h" #include "prototypes.h"
#include "update.h" #include "update.h"
static double prod_materials_cost(struct pchrstr *, short[], int *);
static void materials_charge(struct pchrstr *, short *, double); static void materials_charge(struct pchrstr *, short *, double);
static double prod_resource_limit(struct pchrstr *, unsigned char *);
static char *levelnames[] = { static char *levelnames[] = {
"Technology", "Research", "Education", "Happiness" "Technology", "Research", "Education", "Happiness"
@ -184,7 +186,7 @@ prod_output(struct sctstr *sp, double prodeff)
* Return how much of product @pp can be made from materials @vec[]. * Return how much of product @pp can be made from materials @vec[].
* Store amount of work per unit in *@costp. * Store amount of work per unit in *@costp.
*/ */
double static double
prod_materials_cost(struct pchrstr *pp, short vec[], int *costp) prod_materials_cost(struct pchrstr *pp, short vec[], int *costp)
{ {
double count, n; double count, n;
@ -230,7 +232,7 @@ materials_charge(struct pchrstr *pp, short *vec, double count)
* Return how much of product @pp can be made from its resource. * Return how much of product @pp can be made from its resource.
* If @pp depletes a resource, @resource must point to its value. * If @pp depletes a resource, @resource must point to its value.
*/ */
double static double
prod_resource_limit(struct pchrstr *pp, unsigned char *resource) prod_resource_limit(struct pchrstr *pp, unsigned char *resource)
{ {
if (CANT_HAPPEN(pp->p_nrndx && !resource)) if (CANT_HAPPEN(pp->p_nrndx && !resource))