- Fix Kampf

- NMR-Newbietimeout eine Runde aus

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;

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 {

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