From d1cb08df6e8c06d9de709cece3888f8570ec8be1 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Tue, 13 Apr 2004 21:58:46 +0000
Subject: [PATCH] -
 http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000032   Reduzierung
 von doppelten Messages beim merge von CRs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Wyrm-Funkction wird nict auf älteren Datenfiles ausgeführt
---
 src/common/gamecode/creport.c | 4 ++--
 src/scripts/default.lua       | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 90c6ca7ab..cfbc31e6a 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -455,7 +455,7 @@ render_messages(FILE * F, faction * f, message_list *msgs)
 		char nrbuffer[1024*32];
 		nrbuffer[0] = '\0';
 		if (nr_render(m->msg, f->locale, nrbuffer, sizeof(nrbuffer), f)==0 && nrbuffer[0]) {
-			fprintf(F, "MESSAGE %d\n", ++msgno);
+			fprintf(F, "MESSAGE %u\n", (unsigned int)m->msg);/*++msgno); */
 			fprintf(F, "%d;type\n", hash);
 			fputs("\"", F);
 			fputs(nrbuffer, F);
@@ -465,7 +465,7 @@ render_messages(FILE * F, faction * f, message_list *msgs)
 #endif
 		crbuffer[0] = '\0';
 		if (cr_render(m->msg, crbuffer, (const void*)f)==0) {
-			if (!printed) fprintf(F, "MESSAGE %d\n", ++msgno);
+			if (!printed) fprintf(F, "MESSAGE %u\n", (unsigned int)m->msg);/*++msgno); */
 			if (crbuffer[0]) fputs(crbuffer, F);
 		} else {
 			log_error(("could not render cr-message %p: %s\n", m->msg, m->msg->type->name));
diff --git a/src/scripts/default.lua b/src/scripts/default.lua
index 21d36e7d6..75c12758f 100644
--- a/src/scripts/default.lua
+++ b/src/scripts/default.lua
@@ -6,7 +6,7 @@ function teleport_all(map, grave)
     local u
     for u in r.units do
       u.region = grave
-      print ("  .teleported " .. u)
+      print ("  .teleported " .. u.name)
       grave:add_notice("Ein Portal öffnet sich, und " .. u.name .. " erscheint in " .. grave.name)
     end
   end
@@ -97,7 +97,9 @@ function process(orders)
   process_orders()
   
   -- igjarjuk special
-  wyrm()
+  if get_turn() > 374 then
+    wyrm()
+  end
 
   write_passwords()
   write_reports()