From d5be6ec90252c0b595701a6dde87d50f0ffe8693 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 11 Sep 2004 20:25:49 +0000
Subject: [PATCH] Bugfixes an der define-Aufraeumarbeit

---
 src/Jamrules               | 1 +
 src/common/kernel/battle.c | 1 -
 src/common/kernel/battle.h | 6 +++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Jamrules b/src/Jamrules
index d5599438d..6746c6b99 100644
--- a/src/Jamrules
+++ b/src/Jamrules
@@ -31,6 +31,7 @@ CCFLAGS += -Wwrite-strings
 
 if $(HOST) = "hamunaptra" {
   XMLHDRS = /homes2/info-f/enno/software/hamunaptra/include/libxml2 ;
+  C++FLAGS += -DHAVE_LUABIND_B7 ;
 } else {
   XMLHDRS = /usr/include/libxml2 ;
 }
diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index 84b71e28c..5ea87de27 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -68,7 +68,6 @@
 #define dbgprintf(a) fprintf a;
 static FILE *bdebug;
 
-#define SHOW_KILLS
 #undef DELAYED_OFFENSE /* non-guarding factions cannot attack after moving */
 
 #define TACTICS_RANDOM 5 /* define this as 1 to deactivate */
diff --git a/src/common/kernel/battle.h b/src/common/kernel/battle.h
index 9dc1b6be2..a3ed28339 100644
--- a/src/common/kernel/battle.h
+++ b/src/common/kernel/battle.h
@@ -17,6 +17,11 @@
 extern "C" {
 #endif
 
+#define SHOW_KILLS
+#undef SMALL_BATTLE_MESSAGES
+#undef FIXED_OPPONENTS
+#undef NO_RUNNING  
+
   /** more defines **/
 #define FS_ENEMY 1
 #define FS_HELP  2
@@ -165,7 +170,6 @@ extern "C" {
       int last_action : 4;     /* In welcher Runde haben wir zuletzt etwas getan */
       struct weapon * missile; /* missile weapon */
       struct weapon * melee;   /* melee weapon */
-#undef FIXED_OPPONENTS
 #ifdef FIXED_OPPONENTS
       struct troop opponent;   /* default opponent */
 #endif