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

Removing some defines that have long become the norm for all games.

This commit is contained in:
Enno Rehling 2006-11-04 21:38:25 +00:00
parent 935aabac4e
commit 00d0bbc3b6
11 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/kernel/eressea.c
View File

@ -114,7 +114,7 @@ NewbieImmunity(void) {
static int value = -1;
if (value<0) {
const char * str = get_param(global.parameters, "NewbieImmunity");
value = str?atoi(str):IMMUN_GEGEN_ANGRIFF;
value = str?atoi(str):0;
}
return value;
}
@ -2664,11 +2664,6 @@ lifestyle(const unit * u)
astralspace = getplanebyname("Astralraum");
}
#ifndef ASTRAL_HUNGER
/* Keinen Unterhalt im Astralraum. */
if (getplane(u->region) == astralspace)
return 0;
#endif
if(u->region->planep && fval(u->region->planep, PFL_NOFEED))
return 0;

4
src/common/kernel/eressea.h
View File

@ -185,7 +185,9 @@ struct building_type;
# define RELEASE_VERSION ATTRIBREAD_VERSION
#endif
#if RESOURCE_CONVERSION
#define RESOURCE_CONVERSION
#ifdef RESOURCE_CONVERSION
extern void init_resourcefix(void);
extern void read_iron(struct region * r, int iron);
extern void read_laen(struct region * r, int laen);

6
src/common/kernel/save.c
View File

@ -85,7 +85,7 @@ int firstx = 0, firsty = 0;
static region * current_region;
#if RESOURCE_CONVERSION
#ifdef RESOURCE_CONVERSION
int laen_read(attrib * a, FILE * F)
{
int laen;
@ -750,7 +750,7 @@ read_items(FILE *F, item **ilist)
}
}
#if RESOURCE_CONVERSION
#ifdef RESOURCE_CONVERSION
struct attrib_type at_resources = {
"resources", NULL, NULL, NULL, NULL, NULL, ATF_UNIQUE
};
@ -1299,7 +1299,7 @@ readregion(FILE * F, short x, short y)
i = ri(F); rsethorses(r, i);
if (global.data_version < NEWRESOURCE_VERSION) {
i = ri(F);
#if RESOURCE_CONVERSION
#ifdef RESOURCE_CONVERSION
if (i!=0) read_iron(r, i);
#endif
} else {

2
src/common/kernel/save.h
View File

@ -56,7 +56,7 @@ extern void write_items(FILE *f, struct item *it);
extern const char * datapath(void);
#if RESOURCE_CONVERSION
#ifdef RESOURCE_CONVERSION
extern struct attrib_type at_resources;
#endif

4
src/common/settings-eressea.h
View File

@ -15,17 +15,13 @@
* Include this file from settings.h to make eressea work.
*/
#define ENTERTAINFRACTION 20
#define IMMUN_GEGEN_ANGRIFF 8
#define RESOURCE_CONVERSION 1
#define TEACHDIFFERENCE 2
#define PEASANT_ADJUSTMENT 1
#define GUARD_DISABLES_RECRUIT 1
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define COMBAT_TURNS 5
#define NEW_MIGRATION 1
#define ASTRAL_HUNGER
#define NEWATSROI 0
/* Vermehrungsrate Bauern in 1/10000.

4
src/common/settings-tutorial.h
View File

@ -15,17 +15,13 @@
* Include this file from settings.h to make eressea work.
*/
#define ENTERTAINFRACTION 20
#define IMMUN_GEGEN_ANGRIFF 8
#define RESOURCE_CONVERSION 1
#define TEACHDIFFERENCE 2
#define PEASANT_ADJUSTMENT 1
#define GUARD_DISABLES_RECRUIT 1
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define COMBAT_TURNS 5
#define NEW_MIGRATION 1
#define ASTRAL_HUNGER
#define NEWATSROI 0
/* Vermehrungsrate Bauern in 1/10000.

3
src/common/settings-vinyambar-3.h
View File

@ -15,10 +15,7 @@
* Include this file from settings.h to make eressea work.
*/
#define ENTERTAINFRACTION 20
#define IMMUN_GEGEN_ANGRIFF 8
#define RESOURCE_CONVERSION 1
#define TEACHDIFFERENCE 2
#define PEASANT_ADJUSTMENT 1
#define GUARD_DISABLES_RECRUIT 1
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5

4
src/common/settings-wdw.h
View File

@ -15,17 +15,13 @@
* Include this file from settings.h to make eressea work.
*/
#define ENTERTAINFRACTION 20
#define IMMUN_GEGEN_ANGRIFF 8
#define RESOURCE_CONVERSION 1
#define TEACHDIFFERENCE 2
#define PEASANT_ADJUSTMENT 1
#define GUARD_DISABLES_RECRUIT 1
#define GUARD_DISABLES_PRODUCTION 1
#define RESOURCE_QUANTITY 0.5
#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */
#define COMBAT_TURNS 5
#define NEW_MIGRATION 1
#define ASTRAL_HUNGER
/* Vermehrungsrate Bauern in 1/10000.
* Evt. Berechnungsfehler, reale Vermehrungsraten scheinen höher. */

3
src/eressea/korrektur.c
View File

@ -449,7 +449,6 @@ get_timeout(trigger * td, trigger * tfind)
#include <triggers/shock.h>
#include <triggers/killunit.h>
#if RESOURCE_CONVERSION
extern struct attrib_type at_resources;
void
init_resourcefix(void)
@ -457,8 +456,6 @@ init_resourcefix(void)
at_register(&at_resources);
}
#endif
int
growing_trees(void)
{

1
src/res/eressea.xml
View File

@ -53,6 +53,7 @@
<skill name="stamina" enable="true"/>
<skill name="unarmed" enable="true"/>
<param name="NewbieImmunity" value="8"/>
<param name="entertain.base" value="0"/>
<param name="entertain.perlevel" value="20"/>
<param name="nmr.timeout" value="4"/>

1
src/res/tutorial.xml
View File

@ -54,6 +54,7 @@
<skill name="stamina" enable="true"/>
<skill name="unarmed" enable="true"/>
<param name="NewbieImmunity" value="8"/>
<param name="entertain.base" value="0"></param>
<param name="entertain.perlevel" value="20"></param>
<param name="nmr.timeout" value="2"></param>