From 0bd27124b2531ddd283ef39f642aac03e24cb519 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 17 Jan 2005 20:27:18 +0000
Subject: [PATCH] age_building: neue funktion von steinkreisen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bugfix: steinkreise hatten negative größe

regionid und die Erstzung von \\r entfernt

bugfix: sonnensegel verschwand nicht
bugfix: rückgabewert von use_museumticket war > 0
---
 src/Jamrules             | 3 ++-
 src/scripts/eressea.lua  | 3 +--
 src/scripts/xmas2004.lua | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Jamrules b/src/Jamrules
index 5a0cd982c..23a0d8c7e 100644
--- a/src/Jamrules
+++ b/src/Jamrules
@@ -1,5 +1,5 @@
 C++ = g++ ;
-CC = gcc ;
+CC = tcc ;
 
 if ! $(HAVE_LUA) {
   HAVE_LUA = 1 ;
@@ -44,6 +44,7 @@ if $(HOST) = "hamunaptra" {
 } else {
   XMLHDRS = /usr/include/libxml2 ;
 }
+C++FLAGS += -DHAVE_LUABIND_B7 ;
 
 rule iconv
 {
diff --git a/src/scripts/eressea.lua b/src/scripts/eressea.lua
index 58b6b2949..06bd059db 100644
--- a/src/scripts/eressea.lua
+++ b/src/scripts/eressea.lua
@@ -2,8 +2,7 @@ function run_scripts()
   scripts = { 
     "wedding-jadee.lua", 
     "eternath.lua",
-    "ponnuki.lua",
-    "xmas2004.lua"
+    "ponnuki.lua"
   }
   for index in scripts do
     local script = scriptpath .. "/" .. scripts[index]
diff --git a/src/scripts/xmas2004.lua b/src/scripts/xmas2004.lua
index 49e20b4c9..a77cc3882 100644
--- a/src/scripts/xmas2004.lua
+++ b/src/scripts/xmas2004.lua
@@ -7,7 +7,6 @@ function xmas2004()
       for f in factions() do
         f:add_item("speedsail", 1)
         f:add_notice("santa2004")
-        print(f)
       end
     end
   end