From be015da26344e17b9281553fc05bc24c8b2703a1 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sun, 10 Jan 2010 02:55:23 +0000
Subject: [PATCH] fix crash in tests when no monsters exist

---
 src/common/kernel/battle.h | 2 +-
 src/common/kernel/save.c   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/common/kernel/battle.h b/src/common/kernel/battle.h
index 1ef180c8e..3ba37b7d4 100644
--- a/src/common/kernel/battle.h
+++ b/src/common/kernel/battle.h
@@ -38,7 +38,7 @@ extern "C" {
 #define FLEE_ROW 4
 #define LAST_ROW (NUMROWS-1)
 #define FIRST_ROW FIGHT_ROW
-#define MAXSIDES 128 /* if there are ever more than this, we're fucked. */
+#define MAXSIDES 192 /* if there are ever more than this, we're fucked. */
 
   struct message;
 
diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c
index f4ec7247e..c0bb5ef38 100644
--- a/src/common/kernel/save.c
+++ b/src/common/kernel/save.c
@@ -1645,9 +1645,11 @@ static void
 clear_monster_orders(void)
 {
   faction * f = get_monsters();
-  unit * u;
-  for (u=f->units;u;u=u->nextF) {
-    free_orders(&u->orders);
+  if (f) {
+    unit * u;
+    for (u=f->units;u;u=u->nextF) {
+      free_orders(&u->orders);
+    }
   }
 }