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

8
include/sect.h
View file

@ -37,6 +37,7 @@
#ifndef _SECT_H_
#define _SECT_H_
#include "item.h"
#include "var.h"
/* 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_mcst; /* 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_dstr; /* defensive strength */
int d_value; /* resale ("collect") value */
@ -103,11 +104,6 @@ struct dchrstr {
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 */
#define NAVOK 1 /* ships can always navigate */
#define NAV_02 2 /* requires 2% effic to navigate */