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

(opt_SHIP_DECAY, Options, shiprepair): Remove option SHIP_DECAY.

Browse source
This commit is contained in:
Markus Armbruster 2004-05-09 19:06:48 +00:00
parent cca6abf934
commit 07f5489977
5 changed files with 0 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/options.h
View file

@ -62,7 +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 SHIP_DECAY *//* Allows ships at sea to decay */
#define PLANENAMES /* Use real names for planes, not the boring ones :) */ #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 */

1
include/optlist.h
View file

@ -79,7 +79,6 @@ extern int opt_RES_POP;
extern int opt_ROLLOVER_AVAIL; extern int opt_ROLLOVER_AVAIL;
extern int opt_SAIL; extern int opt_SAIL;
extern int opt_SHIPNAMES; extern int opt_SHIPNAMES;
extern int opt_SHIP_DECAY;
extern int opt_SHOWPLANE; extern int opt_SHOWPLANE;
extern int opt_SLOW_WAR; extern int opt_SLOW_WAR;
extern int opt_SNEAK_ATTACK; extern int opt_SNEAK_ATTACK;

1
info/Server/Options.t
View file

@ -57,7 +57,6 @@ NO_FORT_FIRE: Forts cannot fire.
NO_LCMS: The game doesn't need lcms to be played. NO_LCMS: The game doesn't need lcms to be played.
NO_HCMS: The game doesn't need hcms to be played. NO_HCMS: The game doesn't need hcms to be played.
NO_OIL: The game doesn't need oil to be played. NO_OIL: The game doesn't need oil to be played.
SHIP_DECAY: Allows ships to decay when at sea with not enough crew.
TECH_POP: Technology costs more to make as your civilian population TECH_POP: Technology costs more to make as your civilian population
grows past 50,000 civilians. grows past 50,000 civilians.
TREATIES: Sign treaties with your friends and enemies, and breaking of TREATIES: Sign treaties with your friends and enemies, and breaking of

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

@ -75,12 +75,6 @@ int opt_DEFENSE_INFRA = 1;
int opt_DEFENSE_INFRA = 0; int opt_DEFENSE_INFRA = 0;
#endif #endif
#ifdef SHIP_DECAY
int opt_SHIP_DECAY = 1;
#else
int opt_SHIP_DECAY = 0;
#endif
#ifdef NO_HCMS #ifdef NO_HCMS
int opt_NO_HCMS = 1; int opt_NO_HCMS = 1;
#else #else
@ -345,7 +339,6 @@ struct option_list Options[] = {
{"RES_POP", &opt_RES_POP}, {"RES_POP", &opt_RES_POP},
{"ROLLOVER_AVAIL", &opt_ROLLOVER_AVAIL}, {"ROLLOVER_AVAIL", &opt_ROLLOVER_AVAIL},
{"SAIL", &opt_SAIL}, {"SAIL", &opt_SAIL},
{"SHIP_DECAY", &opt_SHIP_DECAY},
{"SHIPNAMES", &opt_SHIPNAMES}, {"SHIPNAMES", &opt_SHIPNAMES},
{"SHOWPLANE", &opt_SHOWPLANE}, {"SHOWPLANE", &opt_SHOWPLANE},
{"SLOW_WAR", &opt_SLOW_WAR}, {"SLOW_WAR", &opt_SLOW_WAR},

35
src/lib/update/ship.c
View file

@ -301,41 +301,6 @@ shiprepair(register struct shpstr *ship, struct natstr *np,
w_p_eff = 20 + (mp->m_lcm + 2 * mp->m_hcm); w_p_eff = 20 + (mp->m_lcm + 2 * mp->m_hcm);
if (sp->sct_type != SCT_HARBR) {
int abs_max, amt;
if (ship->shp_glim > 0) {
abs_max = vl_find(V_MILIT, mp->m_vtype,
mp->m_vamt, (int)mp->m_nv);
amt = ship->shp_item[I_MILIT];
} else {
abs_max = vl_find(V_CIVIL, mp->m_vtype,
mp->m_vamt, (int)mp->m_nv);
amt = ship->shp_item[I_CIVIL];
if (abs_max == 0) {
abs_max = vl_find(V_MILIT, mp->m_vtype, mp->m_vamt,
(int)mp->m_nv);
amt = ship->shp_item[I_MILIT];
}
}
if (abs_max == 0) {
logerror("Abs max of 0 for ship %d\n", ship->shp_uid);
abs_max = 1;
}
avail -= (etus * (100 - ((amt * 100) / abs_max))) / 7;
/* think of it as entropy in action */
}
if (avail <= 0) {
if (!player->simulation) {
if (opt_SHIP_DECAY) {
ship->shp_effic += avail / w_p_eff;
}
return 1;
}
}
if ((sp->sct_off) && (sp->sct_own == ship->shp_own)) if ((sp->sct_off) && (sp->sct_own == ship->shp_own))
return 1; return 1;