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

Better document how .config must match compiled-in UIDs

Browse source
This commit is contained in:
Markus Armbruster 2011-04-25 10:27:32 +02:00
parent 221268e0e1
commit 03a2c61de4
5 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/item.h
View file

@ -47,6 +47,7 @@ enum {
NUMPKG = BPKG + 1 NUMPKG = BPKG + 1
}; };
/* Item types, must match item.config */
typedef enum { typedef enum {
I_NONE = -1, I_NONE = -1,
I_CIVIL, I_CIVIL,

4
include/sect.h
View file

@ -121,8 +121,7 @@ struct dchrstr {
char *d_name; /* full name of sector type */ char *d_name; /* full name of sector type */
}; };
/* sector types (must agree with order in dchr, empglb.c) */ /* Sector types, must match sect.config */
#define SCT_WATER 0 /* basics */ #define SCT_WATER 0 /* basics */
#define SCT_MOUNT 1 #define SCT_MOUNT 1
#define SCT_SANCT 2 #define SCT_SANCT 2
@ -195,6 +194,7 @@ extern struct dchrstr dchr[SCT_TYPE_MAX + 2];
#define SCT_LANDMINES(sp) \ #define SCT_LANDMINES(sp) \
(SCT_MINES_ARE_SEAMINES((sp)) ? 0 : (sp)->sct_mines) (SCT_MINES_ARE_SEAMINES((sp)) ? 0 : (sp)->sct_mines)
/* Sector infrastructure types, must match infra.config */
#define INT_ROAD 0 #define INT_ROAD 0
#define INT_RAIL 1 #define INT_RAIL 1
#define INT_DEF 2 #define INT_DEF 2

5
src/lib/global/infra.config
View file

@ -27,7 +27,7 @@
# infra.config: Infrastructure characteristics # infra.config: Infrastructure characteristics
# #
# Known contributors to this file: # Known contributors to this file:
# Markus Armbruster, 2006 # Markus Armbruster, 2006-2011
# #
# Derived from sect.c; known contributors: # Derived from sect.c; known contributors:
# Dave Pare, 1986 # Dave Pare, 1986
@ -37,6 +37,9 @@
# Steve McClure, 1998 # Steve McClure, 1998
# #
# Row order is relevant, it must match the compiled-in order defined
# in sect.h
# Do not edit this file to customize a game! Create your own custom # Do not edit this file to customize a game! Create your own custom
# configuration file(s), best next to your econfig, and name them in # configuration file(s), best next to your econfig, and name them in
# econfig key custom_tables. # econfig key custom_tables.

3
src/lib/global/item.config
View file

@ -32,6 +32,9 @@
# Derived from item.c; no known contributors. # Derived from item.c; no known contributors.
# #
# The item types (column uid) must match the compiled-in types defined
# in item.h.
# Columns pkg are indexed by packing types in compiled-in table # Columns pkg are indexed by packing types in compiled-in table
# packing. # packing.

4
src/lib/global/sect.config
View file

@ -37,6 +37,9 @@
# Steve McClure, 1998 # Steve McClure, 1998
# #
# The sector types (column uid) must match the compiled-in types
# defined in sect.h.
# Sector terrain (column terra) is the uid of the underlying terrain # Sector terrain (column terra) is the uid of the underlying terrain
# sector type. Sector types that occur in that column are terrain # sector type. Sector types that occur in that column are terrain
# types, and must have themselves as terrain. # types, and must have themselves as terrain.
@ -97,4 +100,5 @@ uid mnem terra prd peff mob0 mob1 nav pkg ostr dstr val cost bui lcm hcm maint
31 "e" 4 -1 0 0.4 0.2 land norm 1.0 2.0 7 0 1 0 0 0 1000 "enlistment center" 31 "e" 4 -1 0 0.4 0.2 land norm 1.0 2.0 7 0 1 0 0 0 1000 "enlistment center"
32 "~" 32 -1 0 0.4 0.2 land norm 1.0 1.5 1 -1 1 0 0 0 100 "plains" 32 "~" 32 -1 0 0.4 0.2 land norm 1.0 1.5 1 -1 1 0 0 0 100 "plains"
33 "@" 0 -1 0 0.4 0.0 land norm 1.0 1.5 4 -1 1 0 0 0 100 "bridge tower" 33 "@" 0 -1 0 0.4 0.0 land norm 1.0 1.5 4 -1 1 0 0 0 100 "bridge tower"
# Deity-defined sector types go here
/config /config