From f7b7a3799de0dcf26d6db5b60e568d8cea147c7f Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 23 Jun 2002 18:19:35 +0000
Subject: [PATCH] number of combat rounds reduced to 5

---
 src/common/kernel/battle.c    | 4 +++-
 src/common/settings-eressea.h | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 3baccdd69..80c8521c9 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -104,7 +104,9 @@ boolean nobattledebug = false;
 #define MINSPELLRANGE 1
 #define MAXSPELLRANGE 7
 
-#define COMBAT_TURNS			10
+#ifndef COMBAT_TURNS
+# define COMBAT_TURNS 10
+#endif
 
 static const double EFFECT_PANIC_SPELL = 0.25;
 static const double TROLL_REGENERATION = 0.10;
diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h
index 65c783e23..d66561d51 100644
--- a/src/common/settings-eressea.h
+++ b/src/common/settings-eressea.h
@@ -36,5 +36,6 @@
 #define RECRUITFRACTION 40		/* 100/RECRUITFRACTION% */
 #define CATAPULT_AMMUNITION 0	/* Gebaut werden kann sie auch mit 0! */
 #define CHANGED_CROSSBOWS 1
+#define COMBAT_TURNS 5
 
 #define MAILITPATH	"/usr/sbin:$HOME/eressea/bin:/bin:/usr/bin:/usr/local/bin"