From 7d4f345e1ee28e0c1c88674e5fc38fb32b65cec0 Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Sun, 20 Jan 2002 13:29:11 +0000 Subject: [PATCH] - Fix Kampf - NMR-Newbietimeout eine Runde aus --- src/common/kernel/battle.c | 2 +- src/common/kernel/movement.c | 8 ++++++++ src/common/settings-eressea.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 009983531..797db60d8 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -1715,7 +1715,7 @@ hits(troop at, troop dt, weapon * awp) if (!df->alive) return 0; if (getreload(at)) return 0; - if (dist>1 && !fval(awp->type, WTF_MISSILE)) return 0; + if (dist>1 && (awp == NULL || !fval(awp->type, WTF_MISSILE))) return 0; if (af->person[at.index].flags & FL_STUNNED) { af->person[at.index].flags &= ~FL_STUNNED; return 0; diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index b96d05d5d..3e4ca53fc 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -2031,6 +2031,14 @@ movement(void) unit *u = *up; keyword_t kword; + /* Sollte hier nicht mehr auftreten */ + /* + if(u->no == 0) { + up = &u->next; + continue; + } + */ + if (fval(u, FL_FOLLOWING)) { /* skip all followers */ do { diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index 350ab955a..eba5698b6 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -18,6 +18,6 @@ #define NEW_RESOURCEGROWTH 1 #define LARGE_CASTLES 1 #define GROWING_TREES 1 -#define REMOVENMRNEWBIE 1 +#define REMOVENMRNEWBIE 0 #define REMOVENMRTIMEOUT 1 #define HUNGER_DISABLES_LONGORDERS 1