Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove additional unused macro constants

This commit is contained in:
Enno Rehling 2017-03-31 21:29:37 +02:00
parent 57ae21a823
commit d99090ac67
4 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.c
View File

@ -468,7 +468,6 @@ static void recruit(unit * u, struct order *ord, request ** recruitorders)
assert(rc); assert(rc);
u_setrace(u, rc); u_setrace(u, rc);
#if GUARD_DISABLES_RECRUIT
/* this is a very special case because the recruiting unit may be empty /* this is a very special case because the recruiting unit may be empty
* at this point and we have to look at the creating unit instead. This * at this point and we have to look at the creating unit instead. This
* is done in cansee, which is called indirectly by is_guarded(). */ * is done in cansee, which is called indirectly by is_guarded(). */
@ -476,7 +475,6 @@ static void recruit(unit * u, struct order *ord, request ** recruitorders)
cmistake(u, ord, 70, MSG_EVENT); cmistake(u, ord, 70, MSG_EVENT);
return; return;
} }
#endif
if (rc == get_race(RC_INSECT)) { if (rc == get_race(RC_INSECT)) {
gamedate date; gamedate date;

2
src/kernel/save.c
View File

@ -1121,9 +1121,7 @@ static ally **addally(const faction * f, ally ** sfp, int aid, int state)
ally *sf; ally *sf;
state &= ~HELP_OBSERVE; state &= ~HELP_OBSERVE;
#ifndef REGIONOWNERS
state &= ~HELP_TRAVEL; state &= ~HELP_TRAVEL;
#endif
state &= HelpMask(); state &= HelpMask();
if (state == 0) if (state == 0)

27
src/laws.c
View File

@ -284,31 +284,6 @@ static double peasant_growth_factor(void)
return config_get_flt("rules.peasants.growth.factor", 0.0001F * PEASANTGROWTH); return config_get_flt("rules.peasants.growth.factor", 0.0001F * PEASANTGROWTH);
} }
#ifdef SLOWLUCK
int peasant_luck_effect(int peasants, int luck, int maxp, double variance) {
int n, births = 0;
double factor = peasant_growth_factor();
for (n = peasants; n && luck; --n) {
int chances = 0;
if (luck > 0) {
--luck;
chances += PEASANTLUCK;
}
while (chances--) {
if (rng_double() < factor) {
/* Only raise with 75% chance if peasants have
* reached 90% of maxpopulation */
if (peasants / (float)maxp < 0.9 || chance(PEASANTFORCE)) {
++births;
}
}
}
}
return births;
}
#else
static double peasant_luck_factor(void) static double peasant_luck_factor(void)
{ {
return config_get_flt("rules.peasants.peasantluck.factor", PEASANTLUCK); return config_get_flt("rules.peasants.peasantluck.factor", PEASANTLUCK);
@ -331,8 +306,6 @@ int peasant_luck_effect(int peasants, int luck, int maxp, double variance)
return births; return births;
} }
#endif
static void peasants(region * r, int rule) static void peasants(region * r, int rule)
{ {
int peasants = rpeasants(r); int peasants = rpeasants(r);

3
src/settings.h
View File

@ -12,7 +12,6 @@
#define ENTERTAINFRACTION 20 #define ENTERTAINFRACTION 20
#define TEACHDIFFERENCE 2 #define TEACHDIFFERENCE 2
#define GUARD_DISABLES_RECRUIT 1
#define RESOURCE_QUANTITY 0.5 #define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ #define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define COMBAT_TURNS 5 #define COMBAT_TURNS 5
@ -31,8 +30,6 @@
*/ */
#define MUSEUM_MODULE 1 #define MUSEUM_MODULE 1
#undef REGIONOWNERS /* (WIP) region-owner uses HELP_TRAVEL to control entry to region */
/* experimental gameplay features (that don't affect the savefile) */ /* experimental gameplay features (that don't affect the savefile) */
/* TODO: move these settings to settings.h or into configuration files */ /* TODO: move these settings to settings.h or into configuration files */
#define GOBLINKILL /* Goblin-Spezialklau kann toedlich enden */ #define GOBLINKILL /* Goblin-Spezialklau kann toedlich enden */