From 67cf73d42c68effa918ba5d05db189f6b31ae1be Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 23 Jul 2014 16:01:56 +0200
Subject: [PATCH] update ini files so tests will pass again

---
 game-e2/eressea.ini       | 2 +-
 game-e3/eressea.ini       | 2 +-
 s/runtests                | 2 +-
 scripts/tests/eressea.lua | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/game-e2/eressea.ini b/game-e2/eressea.ini
index f92fcd87e..1abf1be35 100644
--- a/game-e2/eressea.ini
+++ b/game-e2/eressea.ini
@@ -8,7 +8,7 @@ memcheck = 0
 locales = de,en
 
 [config]
-game = eressea
+rules = eressea
 source_dir = ..
 maxnmrs = 10
 
diff --git a/game-e3/eressea.ini b/game-e3/eressea.ini
index ddae64c0e..fdfe6277c 100644
--- a/game-e3/eressea.ini
+++ b/game-e3/eressea.ini
@@ -8,7 +8,7 @@ memcheck = 0
 locales = de,en
 
 [config]
-game = e3a
+rules = e3a
 source_dir = ..
 maxnmrs = 20
 
diff --git a/s/runtests b/s/runtests
index bacceca0e..fbc466e0e 100755
--- a/s/runtests
+++ b/s/runtests
@@ -18,5 +18,5 @@ fi
 $ROOT/$BIN_DIR/eressea/test_eressea
 cd $ROOT
 $ROOT/$BIN_DIR/eressea/eressea -v0 scripts/runtests.lua
-grep ERROR eressea.log
+#grep ERROR eressea.log
 cd $OLDWPD
diff --git a/scripts/tests/eressea.lua b/scripts/tests/eressea.lua
index 547f23955..789b81b6b 100644
--- a/scripts/tests/eressea.lua
+++ b/scripts/tests/eressea.lua
@@ -137,9 +137,9 @@ function test_ship_capacity()
     process_orders()
 
 --    print(s.region, u.region, r2)
-    assert_equal(r2.id, u1.region.id, "boat with 5 humans did not move")
-    assert_not_equal(r2.id, u2.region.id, "boat with too many people has moved")
-    assert_not_equal(r2.id, u4.region.id, "boat with too much cargo has moved")
+    assert_equal(r2, u1.region, "boat with 5 humans did not move")
+    assert_not_equal(r2, u2.region, "boat with too many people has moved")
+    assert_not_equal(r2, u4.region, "boat with too much cargo has moved")
 end
 
 function test_levitate()