From 58626cdcd0e1cb11f6bf7d9547e1420c99e4bc5f Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Sun, 28 Apr 2002 15:08:28 +0000 Subject: [PATCH] - mapper kompiliert wieder --- src/common/kernel/battle.c | 5 ++--- src/common/settings-eressea.h | 10 +++++----- src/mapper/Makefile | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 53b3fd2da..8d083a6d7 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -1051,7 +1051,7 @@ terminate(troop dt, troop at, int type, const char *damage, boolean missile) } #if CHANGED_CROSSBOWS == 1 - if(fval(awtype,ARMORPIERCING)) { + if(fval(awtype,WTF_ARMORPIERCING)) { /* crossbows */ ar /= 2; an /= 2; @@ -2685,8 +2685,7 @@ make_fighter(battle * b, unit * u, boolean attack) int h; int berserk; int strongmen; - int speeded = 0; - int speed = 0; + int speeded = 0, speed = 1; boolean pr_aid = false; boolean stealth = (boolean)((fval(u, FL_PARTEITARNUNG)!=0)?true:false); int rest; diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index 093f94acc..ab9f01cb3 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -30,10 +30,10 @@ #define SKILLPOINTS 0 #define NEW_MIGRATION 1 #define PEASANTS_DO_NOT_STARVE 0 -#define GUARD_DISABLES_RECRUIT 1 -#define GUARD_DISABLES_PRODUCTION 1 -#define RESOURCE_QUANTITY 0.5 -#define RECRUITFRACTION 40 /* 100/RECRUITFRACTION% */ +#define GUARD_DISABLES_RECRUIT 0 +#define GUARD_DISABLES_PRODUCTION 0 +#define RESOURCE_QUANTITY 1.0 +#define RECRUITFRACTION 20 /* 100/RECRUITFRACTION% */ #define CATAPULT_AMMUNITION 0 /* Gebaut werden kann sie auch mit 0! */ -#define CHANGED_CROSSBOWS 1 +#define CHANGED_CROSSBOWS 0 diff --git a/src/mapper/Makefile b/src/mapper/Makefile index 24dd9a7d1..6819b0065 100644 --- a/src/mapper/Makefile +++ b/src/mapper/Makefile @@ -27,6 +27,7 @@ LIBS += \ -le-races \ -le-attributes \ -le-util \ + -le-modules \ -lm ifeq ($(NCURSES), 1)