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

- Fix Kampf 

- NMR-Newbietimeout eine Runde aus
This commit is contained in:
Christian Schlittchen 2002-01-20 13:29:11 +00:00
parent fcd72cb2b6
commit 7d4f345e1e
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kernel/battle.c
View File

@ -1715,7 +1715,7 @@ hits(troop at, troop dt, weapon * awp)
if (!df->alive) return 0; if (!df->alive) return 0;
if (getreload(at)) 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) { if (af->person[at.index].flags & FL_STUNNED) {
af->person[at.index].flags &= ~FL_STUNNED; af->person[at.index].flags &= ~FL_STUNNED;
return 0; return 0;

8
src/common/kernel/movement.c
View File

@ -2031,6 +2031,14 @@ movement(void)
unit *u = *up; unit *u = *up;
keyword_t kword; keyword_t kword;
/* Sollte hier nicht mehr auftreten */
/*
if(u->no == 0) {
up = &u->next;
continue;
}
*/
if (fval(u, FL_FOLLOWING)) { if (fval(u, FL_FOLLOWING)) {
/* skip all followers */ /* skip all followers */
do { do {

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

@ -18,6 +18,6 @@
#define NEW_RESOURCEGROWTH 1 #define NEW_RESOURCEGROWTH 1
#define LARGE_CASTLES 1 #define LARGE_CASTLES 1
#define GROWING_TREES 1 #define GROWING_TREES 1
#define REMOVENMRNEWBIE 1 #define REMOVENMRNEWBIE 0
#define REMOVENMRTIMEOUT 1 #define REMOVENMRTIMEOUT 1
#define HUNGER_DISABLES_LONGORDERS 1 #define HUNGER_DISABLES_LONGORDERS 1