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

(PLANENAMES, opt_PLANENAMES, Options, plchrstr, plchr_ca, plchr,

Browse source 
main): Remove nooption PLANENAMES.
This commit is contained in:
Markus Armbruster 2004-08-21 06:48:34 +00:00
parent 914e21cdfd
commit 5e381b6c57
7 changed files with 1 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/options.h
View file

@ -62,8 +62,6 @@
/*#define START_UNITS 2 *//* How many free start units you get. Types are /*#define START_UNITS 2 *//* How many free start units you get. Types are
specified in src/lib/global/constants.c */ specified in src/lib/global/constants.c */
#define PLANENAMES /* Use real names for planes, not the boring ones :) */
/* #define GO_RENEW *//* Gold and Oil are renewable resources */ /* #define GO_RENEW *//* Gold and Oil are renewable resources */
/* #define DEFENSE_INFRA *//* Allow the improvement of defensive infrastructure */ /* #define DEFENSE_INFRA *//* Allow the improvement of defensive infrastructure */

1
include/optlist.h
View file

@ -74,7 +74,6 @@ extern int opt_NO_PLAGUE;
extern int opt_NUKEFAILDETONATE; extern int opt_NUKEFAILDETONATE;
extern int opt_ORBIT; extern int opt_ORBIT;
extern int opt_PINPOINTMISSILE; extern int opt_PINPOINTMISSILE;
extern int opt_PLANENAMES;
extern int opt_RES_POP; extern int opt_RES_POP;
extern int opt_ROLLOVER_AVAIL; extern int opt_ROLLOVER_AVAIL;
extern int opt_SAIL; extern int opt_SAIL;

3
include/plane.h
View file

@ -82,8 +82,7 @@ struct plnstr {
#define PLN_AIRBURST bit(2) /* Airburst the nuke we're armed with */ #define PLN_AIRBURST bit(2) /* Airburst the nuke we're armed with */
struct plchrstr { struct plchrstr {
s_char *pl_name; /* plane vanilla unit name */ s_char *pl_name; /* full name of type of plane */
s_char *pl_planename; /* plane real name */
int pl_lcm; /* costs to build */ int pl_lcm; /* costs to build */
int pl_hcm; int pl_hcm;
int pl_cost; int pl_cost;

1
src/lib/commands/xdump.c
View file

@ -130,7 +130,6 @@ static struct castr pchr_ca[] = {
static struct castr plchr_ca[] = { static struct castr plchr_ca[] = {
{NSC_STRING, 0, 0, offsetof(struct plchrstr, pl_name), "name"}, {NSC_STRING, 0, 0, offsetof(struct plchrstr, pl_name), "name"},
{NSC_STRING, 0, 0, offsetof(struct plchrstr, pl_planename), "planename"},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_lcm), "lcm"}, {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_lcm), "lcm"},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_hcm), "hcm"}, {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_hcm), "hcm"},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_cost), "cost"}, {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_cost), "cost"},

7
src/lib/global/options.c
View file

@ -93,12 +93,6 @@ int opt_NO_OIL = 1;
int opt_NO_OIL = 0; int opt_NO_OIL = 0;
#endif #endif
#ifdef PLANENAMES
int opt_PLANENAMES = 1;
#else
int opt_PLANENAMES = 0;
#endif
#ifdef LANDSPIES #ifdef LANDSPIES
int opt_LANDSPIES = 1; int opt_LANDSPIES = 1;
#else #else
@ -329,7 +323,6 @@ struct option_list Options[] = {
{"NUKEFAILDETONATE", &opt_NUKEFAILDETONATE}, {"NUKEFAILDETONATE", &opt_NUKEFAILDETONATE},
{"ORBIT", &opt_ORBIT}, {"ORBIT", &opt_ORBIT},
{"PINPOINTMISSILE", &opt_PINPOINTMISSILE}, {"PINPOINTMISSILE", &opt_PINPOINTMISSILE},
{"PLANENAMES", &opt_PLANENAMES},
{"RES_POP", &opt_RES_POP}, {"RES_POP", &opt_RES_POP},
{"SAIL", &opt_SAIL}, {"SAIL", &opt_SAIL},
{"SHIPNAMES", &opt_SHIPNAMES}, {"SHIPNAMES", &opt_SHIPNAMES},

35
src/lib/global/plane.c
View file

@ -61,7 +61,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"f1 fighter 1",
"f1 Sopwith Camel", "f1 Sopwith Camel",
8, 2, 400, 50, 90, 1, 1, 1, 4, 1, 1, 8, 2, 400, 50, 90, 1, 1, 1, 4, 1, 1,
0, 0,
@ -69,7 +68,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"f2 fighter 2",
"f2 P-51 Mustang", "f2 P-51 Mustang",
8, 2, 400, 80, 80, 1, 4, 4, 8, 1, 1, 8, 2, 400, 80, 80, 1, 4, 4, 8, 1, 1,
0, 0,
@ -77,7 +75,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"jf1 jet fighter 1",
"jf1 F-4 Phantom", "jf1 F-4 Phantom",
12, 4, 1000, 125, 45, 1, 14, 14, 11, 2, 3, 12, 4, 1000, 125, 45, 1, 14, 14, 11, 2, 3,
0, 0,
@ -86,7 +83,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"jf2 jet fighter 2",
"jf2 AV-8B Harrier", "jf2 AV-8B Harrier",
12, 4, 1400, 195, 30, 1, 17, 17, 14, 2, 3, 12, 4, 1400, 195, 30, 1, 17, 17, 14, 2, 3,
0, 0,
@ -94,7 +90,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"sf stealth fighter",
"sf F-117A Nighthawk", "sf F-117A Nighthawk",
15, 5, 3000, 325, 45, 3, 19, 19, 20, 2, 4, 15, 5, 3000, 325, 45, 3, 19, 19, 20, 2, 4,
80, 80,
@ -102,7 +97,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"es escort",
"es P-38 Lightning", "es P-38 Lightning",
9, 3, 700, 90, 60, 1, 5, 5, 15, 1, 2, 9, 3, 700, 90, 60, 1, 5, 5, 15, 1, 2,
0, 0,
@ -110,7 +104,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"jes jet escort",
"jes F-14E jet escort", "jes F-14E jet escort",
14, 8, 1400, 160, 60, 1, 10, 10, 25, 2, 3, 14, 8, 1400, 160, 60, 1, 10, 10, 25, 2, 3,
0, 0,
@ -118,7 +111,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"lb lt bomber",
"lb TBD-1 Devastator", "lb TBD-1 Devastator",
10, 3, 550, 60, 50, 2, 0, 3, 7, 1, 1, 10, 3, 550, 60, 50, 2, 0, 3, 7, 1, 1,
0, 0,
@ -126,7 +118,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"jl jet lt bomber",
"jl A-6 Intruder", "jl A-6 Intruder",
14, 4, 1000, 130, 25, 3, 0, 9, 11, 2, 3, 14, 4, 1000, 130, 25, 3, 0, 9, 11, 2, 3,
0, 0,
@ -134,7 +125,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"mb medium bomber",
"mb medium bomber", "mb medium bomber",
14, 5, 1000, 80, 45, 4, 0, 5, 14, 3, 3, 14, 5, 1000, 80, 45, 4, 0, 5, 14, 3, 3,
0, 0,
@ -142,13 +132,11 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"jmb jet med bomber",
"jfb FB-111 Aardvark f/b", "jfb FB-111 Aardvark f/b",
20, 10, 1800, 140, 30, 7, 8, 8, 20, 5, 5, 20, 10, 1800, 140, 30, 7, 8, 8, 20, 5, 5,
0, 0,
P_T | P_B}, P_T | P_B},
{ {
"hb hvy bomber",
"hb B-26B Marauder", "hb B-26B Marauder",
20, 6, 1100, 90, 90, 5, 0, 4, 15, 2, 2, 20, 6, 1100, 90, 90, 5, 0, 4, 15, 2, 2,
0, 0,
@ -156,7 +144,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"jhb jet hvy bomber",
"jhb B-52 Strato-Fortress", "jhb B-52 Strato-Fortress",
26, 13, 3200, 150, 80, 12, 0, 11, 35, 5, 6, 26, 13, 3200, 150, 80, 12, 0, 11, 35, 5, 6,
0, 0,
@ -164,7 +151,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"sb stealth bomber",
"sb B-2 stealth bomber", "sb B-2 stealth bomber",
15, 5, 4000, 325, 25, 8, 0, 15, 28, 2, 5, 15, 5, 4000, 325, 25, 8, 0, 15, 28, 2, 5,
80, 80,
@ -173,7 +159,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"as anti-sub plane",
"as anti-sub plane", "as anti-sub plane",
10, 3, 550, 100, 85, 2, 0, 3, 15, 2, 2, 10, 3, 550, 100, 85, 2, 0, 3, 15, 2, 2,
0, 0,
@ -181,7 +166,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"np naval plane",
"np naval plane", "np naval plane",
20, 10, 1800, 135, 70, 3, 0, 4, 28, 4, 2, 20, 10, 1800, 135, 70, 3, 0, 4, 28, 4, 2,
0, 0,
@ -189,7 +173,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"nc naval chopper",
"nc AH-1 Cobra", "nc AH-1 Cobra",
8, 2, 800, 160, 55, 2, 0, 3, 11, 2, 2, 8, 2, 800, 160, 55, 2, 0, 3, 11, 2, 2,
0, 0,
@ -197,7 +180,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"ac attack chopper",
"ac AH-64 Apache", "ac AH-64 Apache",
8, 2, 800, 200, 15, 1, 0, 9, 11, 2, 2, 8, 2, 800, 200, 15, 1, 0, 9, 11, 2, 2,
40, 40,
@ -205,7 +187,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"tc transport chopper",
"tc transport chopper", "tc transport chopper",
8, 2, 800, 135, 0, 5, 0, 3, 7, 2, 2, 8, 2, 800, 135, 0, 5, 0, 3, 7, 2, 2,
40, 40,
@ -213,7 +194,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"tr transport",
"tr C-56 Lodestar", "tr C-56 Lodestar",
14, 5, 1000, 85, 0, 7, 0, 2, 15, 3, 3, 14, 5, 1000, 85, 0, 7, 0, 2, 15, 3, 3,
0, 0,
@ -221,7 +201,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"jt jet transport",
"jt C-141 Starlifter", "jt C-141 Starlifter",
18, 5, 1500, 160, 0, 16, 0, 9, 35, 3, 4, 18, 5, 1500, 160, 0, 16, 0, 9, 35, 3, 4,
0, 0,
@ -229,14 +208,12 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"zep Zeppelin",
"zep Zeppelin", "zep Zeppelin",
6, 2, 1000, 70, 60, 2, 0, -3, 15, 3, 2, 6, 2, 1000, 70, 60, 2, 0, -3, 15, 3, 2,
0, 0,
P_S | P_V | P_T | P_C}, P_S | P_V | P_T | P_C},
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"re recon",
"re recon", "re recon",
12, 4, 800, 130, 0, 0, 0, 4, 15, 2, 2, 12, 4, 800, 130, 0, 0, 0, 4, 15, 2, 2,
20, 20,
@ -244,7 +221,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"sp spyplane",
"sp E2-C Hawkeye", "sp E2-C Hawkeye",
15, 5, 2000, 190, 0, 0, 0, 11, 32, 2, 5, 15, 5, 2000, 190, 0, 0, 0, 11, 32, 2, 5,
50, 50,
@ -252,7 +228,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"lst landsat",
"lst landsat", "lst landsat",
20, 20, 2000, 245, 0, 0, 0, 3, 41, 0, 9, 20, 20, 2000, 245, 0, 0, 0, 3, 41, 0, 9,
0, 0,
@ -260,7 +235,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"ss spysat",
"ss KH-7 spysat", "ss KH-7 spysat",
20, 20, 4000, 305, 0, 0, 0, 3, 61, 0, 9, 20, 20, 4000, 305, 0, 0, 0, 3, 61, 0, 9,
0, 0,
@ -268,14 +242,12 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"mi naval missile",
"mi Harpoon", "mi Harpoon",
8, 2, 300, 160, 50, 6, 0, 5, 6, 0, 0, 8, 2, 300, 160, 50, 6, 0, 5, 6, 0, 0,
0, 0,
P_L | P_T | P_M | P_MAR}, P_L | P_T | P_M | P_MAR},
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"sam sam",
"sam Sea Sparrow", "sam Sea Sparrow",
3, 1, 200, 180, 0, 0, 0, 18, 2, 0, 0, 3, 1, 200, 180, 0, 0, 0, 18, 2, 0, 0,
0, 0,
@ -283,7 +255,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"ssm",
"ssm V2", "ssm V2",
15, 15, 800, 145, 60, 3, 0, 3, 4, 0, 0, 15, 15, 800, 145, 60, 3, 0, 3, 4, 0, 0,
0, 0,
@ -291,7 +262,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"srbm",
"srbm Atlas", "srbm Atlas",
20, 20, 1000, 200, 60, 6, 0, 5, 9, 0, 0, 20, 20, 1000, 200, 60, 6, 0, 5, 9, 0, 0,
0, 0,
@ -299,7 +269,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"irbm",
"irbm Titan", "irbm Titan",
20, 20, 1500, 260, 60, 8, 0, 10, 15, 0, 0, 20, 20, 1500, 260, 60, 8, 0, 10, 15, 0, 0,
0, 0,
@ -307,14 +276,12 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"icbm",
"icbm Minuteman", "icbm Minuteman",
20, 20, 3000, 310, 60, 10, 0, 15, 41, 0, 0, 20, 20, 3000, 310, 60, 10, 0, 15, 41, 0, 0,
0, 0,
P_T | P_M}, P_T | P_M},
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"slbm",
"slbm Trident", "slbm Trident",
20, 20, 2000, 280, 60, 8, 0, 6, 23, 0, 0, 20, 20, 2000, 280, 60, 8, 0, 6, 23, 0, 0,
0, 0,
@ -322,7 +289,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"asat anti-sat",
"asat anti-sat", "asat anti-sat",
20, 20, 2000, 305, 50, 6, 0, 7, 13, 0, 4, 20, 20, 2000, 305, 50, 6, 0, 7, 13, 0, 4,
0, 0,
@ -330,7 +296,6 @@ struct plchrstr plchr[] = {
/* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */ /* name lcm hcm $$$ tch acc ld at/df ran mil gas stlth flags */
{ {
"abm anti-ballistic missile",
"abm Patriot", "abm Patriot",
16, 8, 1500, 270, 50, 0, 0, 31, 12, 0, 0, 16, 8, 1500, 270, 50, 0, 0, 31, 12, 0, 0,
0, 0,

2
src/server/main.c
View file

@ -405,8 +405,6 @@ nullify_objects(void)
plchr[i].pl_lcm = 0; plchr[i].pl_lcm = 0;
if (opt_NO_OIL) if (opt_NO_OIL)
plchr[i].pl_fuel = 0; plchr[i].pl_fuel = 0;
if (opt_PLANENAMES)
plchr[i].pl_name = plchr[i].pl_planename;
} }
for (i = 0; i < lnd_maxno; i++) { for (i = 0; i < lnd_maxno; i++) {
if (opt_NO_HCMS) if (opt_NO_HCMS)