From 59c8fbc5a55a8f3f9f24a5f22111bfc9d6400f67 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 29 Oct 2016 17:51:01 +0200 Subject: [PATCH] fix bad Lua test for ents, so they actually guard. --- scripts/tests/economy.lua | 2 +- src/settings.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/tests/economy.lua b/scripts/tests/economy.lua index ebacc32e1..5678cfc6c 100644 --- a/scripts/tests/economy.lua +++ b/scripts/tests/economy.lua @@ -132,10 +132,10 @@ function test_ent_guards_trees() u:set_skill("mining", 1) local guard = unit.create(get_monsters(), r, 1, "ent") u:set_skill("forestry", 1) - guard:add_order("BEWACHEN") guard:clear_orders() u:clear_orders() + guard:add_order("BEWACHEN") u:add_order("MACHE HOLZ") process_orders() assert_equal(1, u:get_item("log")) diff --git a/src/settings.h b/src/settings.h index c44bc0f2a..ecf3df9f2 100644 --- a/src/settings.h +++ b/src/settings.h @@ -10,10 +10,6 @@ without prior permission by the authors of Eressea. */ -/* - * Contains defines for the "free" game (Eressea) . - * Include this file from settings.h to make eressea work. - */ #define ENTERTAINFRACTION 20 #define TEACHDIFFERENCE 2 #define GUARD_DISABLES_RECRUIT 1