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

(i_packing): New. Use where appropriate.

Browse source 
(NPKG, WPKG, UPKG, BPKG, NUMPKG): Turn macros into enumeration
constants.
(NPKG, WPKG, UPKG, BPKG): Move from sect.h to item.h.
This commit is contained in:
Markus Armbruster 2004-04-09 06:30:21 +00:00
parent d12359938b
commit b0627a97cb
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/item.h
View file

@ -34,7 +34,16 @@
#ifndef _ITEM_H_ #ifndef _ITEM_H_
#define _ITEM_H_ #define _ITEM_H_
#define NUMPKG 4 /* number of different kinds of packaging */ typedef enum {
NPKG, /* no special packaging */
WPKG, /* "warehouse" packaging */
UPKG, /* "urban" packaging */
BPKG /* "bank" packaging */
} i_packing;
enum {
NUMPKG = BPKG + 1
};
struct ichrstr { struct ichrstr {
int i_mnem; /* usually the initial letter */ int i_mnem; /* usually the initial letter */

8
include/sect.h
View file

@ -37,6 +37,7 @@
#ifndef _SECT_H_ #ifndef _SECT_H_
#define _SECT_H_ #define _SECT_H_
#include "item.h"
#include "var.h" #include "var.h"
/* The order of the following elements is there to match up with genitem */ /* The order of the following elements is there to match up with genitem */
@ -92,7 +93,7 @@ struct dchrstr {
int d_prd; /* product vtype */ int d_prd; /* product vtype */
int d_mcst; /* movement cost */ int d_mcst; /* movement cost */
int d_flg; /* movement cost */ int d_flg; /* movement cost */
int d_pkg; /* type of packaging in these sects */ i_packing d_pkg; /* type of packaging in these sects */
float d_ostr; /* offensive strength */ float d_ostr; /* offensive strength */
float d_dstr; /* defensive strength */ float d_dstr; /* defensive strength */
int d_value; /* resale ("collect") value */ int d_value; /* resale ("collect") value */
@ -103,11 +104,6 @@ struct dchrstr {
s_char *d_name; /* full name of sector type */ s_char *d_name; /* full name of sector type */
}; };
#define NPKG 0 /* no special packaging */
#define WPKG 1 /* "warehouse" packaging */
#define UPKG 2 /* "urban" packaging */
#define BPKG 3 /* "bank" packaging */
/* for d_flg */ /* for d_flg */
#define NAVOK 1 /* ships can always navigate */ #define NAVOK 1 /* ships can always navigate */
#define NAV_02 2 /* requires 2% effic to navigate */ #define NAV_02 2 /* requires 2% effic to navigate */

4
src/lib/update/distribute.c
View file

@ -58,10 +58,10 @@ dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
int thresh; int thresh;
int amt_dist; int amt_dist;
int amt_sect; int amt_sect;
int packing; i_packing packing;
float imcost; float imcost;
float excost; float excost;
int dist_packing; i_packing dist_packing;
int diff; int diff;
int item; int item;
int changed; int changed;