From 34a83b6d20f09931a9fe09026f62c25cdd7b40eb Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sun, 11 Feb 2001 19:55:00 +0000
Subject: [PATCH] - Plane-Id wieder in der Zugvorlage

---
 src/Makefile.include         | 14 +++++++-------
 src/common/gamecode/report.c |  9 +++++++--
 src/corwin.mk                |  3 +--
 src/eressea/main.c           |  8 +-------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/Makefile.include b/src/Makefile.include
index 31ad98ac4..13e7cbb17 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -15,7 +15,7 @@ INSTALL = @cp
 #INSTALL = install
 
 
-ARFLAGS = cr
+ARFLAGS = crs
 CTAGSFLAGS = --langmap=c:.c.h --c-types=-m
 CFLAGS  = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \
            -Wpointer-arith -Werror-implicit-function-declaration \
@@ -68,8 +68,8 @@ endif
 
 ifeq ($(CONFIG), debug)
   BUILD_DIR  = Debug-$(ARCHITECTURE)
-  CFLAGS    += -g
-  LDFLAGS   += -g
+  CFLAGS    += -ggdb
+  LDFLAGS   += -ggdb
 endif
 
 ifeq ($(CONFIG), release)
@@ -80,14 +80,14 @@ endif
 
 ifeq ($(CONFIG), profile)
   BUILD_DIR  = Profile-$(ARCHITECTURE)
-  CFLAGS    += -g -pg -O4 -funroll-loops
-  LDFLAGS   += -g -pg
+  CFLAGS    += -ggdb -pg -O4 -funroll-loops
+  LDFLAGS   += -ggdb -pg
 endif
 
 ifeq ($(CONFIG), dmalloc)
   BUILD_DIR  = Dmalloc-$(ARCHITECTURE)
-  CFLAGS    += -g -DDMALLOC
-  LDFLAGS   += -g
+  CFLAGS    += -ggdb -DDMALLOC
+  LDFLAGS   += -ggdb
   LIBS      += -ldmalloc
 endif
 
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index a10fc2f14..55bc0fca7 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: report.c,v 1.13 2001/02/10 13:20:33 corwin Exp $
+ *	$Id: report.c,v 1.14 2001/02/11 19:55:00 corwin Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -1320,8 +1320,13 @@ order_template(FILE * F, faction * f)
 					if (pl && fval(pl, PFL_NOCOORDS)) {
 						sprintf(buf, "REGION; %s", rname(r, f->locale));
 					} else {
-						sprintf(buf, "REGION %d,%d ; %s", region_x(r,f),
+						if(pl->id != 0) {
+							sprintf(buf, "REGION %d,%d,%d ; %s", region_x(r,f),
+								region_y(r,f), rname(r, f->locale), pl->id);
+						} else {
+							sprintf(buf, "REGION %d,%d ; %s", region_x(r,f),
 								region_y(r,f), rname(r, f->locale));
+						}
 					}
 					rps_nowrap(F, buf);
 					rnl(F);
diff --git a/src/corwin.mk b/src/corwin.mk
index ee2f43ff9..dc75481e7 100644
--- a/src/corwin.mk
+++ b/src/corwin.mk
@@ -4,10 +4,9 @@ ifndef ERESSEA
 endif
 
 # Hier definieren, damit nicht '@gcc'
-CC      = gcc
+CC      = colorgcc
 AR      = ar
 CTAGS   = ctags
-CC      = gcc
 LD      = gcc
 INSTALL = cp
 
diff --git a/src/eressea/main.c b/src/eressea/main.c
index 9285fbb54..c64a8e3bf 100644
--- a/src/eressea/main.c
+++ b/src/eressea/main.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: main.c,v 1.13 2001/02/10 22:02:10 enno Exp $
+ *	$Id: main.c,v 1.14 2001/02/11 19:55:00 corwin Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -533,12 +533,6 @@ main(int argc, char *argv[])
 	kernel_init();
 	game_init();
 
-	{
-		FILE * F = fopen("c:\\messagetypes.txt", "wt");
-		debug_messagetypes(F);
-		fclose(F);
-	}
-
 	if ((i=readgame(false))!=0) return i;
 	if ((i=processturn(orders))!=0) return i;