From 4c02ee9c204ef7bde2c28d6f643f974b4150dee4 Mon Sep 17 00:00:00 2001
From: Christian Schlittchen <corwin@amber.kn-bremen.de>
Date: Sun, 18 Feb 2001 09:32:13 +0000
Subject: [PATCH] - Fix usetprivate

---
 src/Makefile.include       | 2 +-
 src/common/gamecode/laws.c | 3 ++-
 src/common/kernel/unit.c   | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.include b/src/Makefile.include
index aaf5d9098..a67db683b 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -20,7 +20,7 @@ CTAGSFLAGS = --langmap=c:.c.h --c-types=-m
 CFLAGS  = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \
            -Wpointer-arith -Werror-implicit-function-declaration \
 		   -Wno-char-subscripts \
-       	   -march=pentiumpro -fPIC $(INCLUDES)
+       	   -march=pentiumpro $(INCLUDES)
 LDFLAGS = $(LIBS)
 
 LIBS    = -L$(PUBLISH_DIR)
diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index dab8528fc..5cafa820a 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: laws.c,v 1.24 2001/02/17 16:07:02 enno Exp $
+ *	$Id: laws.c,v 1.25 2001/02/18 09:32:13 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)
@@ -1864,6 +1864,7 @@ instant_orders(void)
 
 	for (r = regions; r; r = r->next)
 		for (u = r->units; u; u = u->next) {
+			printf("Unit: %s\n", itoa36(u->no));
 #ifdef GROUPS
 			for (S = u->orders; S; S = S->next)
 			{
diff --git a/src/common/kernel/unit.c b/src/common/kernel/unit.c
index acaa02bc9..70542d14a 100644
--- a/src/common/kernel/unit.c
+++ b/src/common/kernel/unit.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: unit.c,v 1.5 2001/02/10 14:18:00 enno Exp $
+ *	$Id: unit.c,v 1.6 2001/02/18 09:32:13 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)
@@ -213,7 +213,11 @@ uprivate(const unit * u) {
 void
 usetprivate(unit * u, const char * str) {
 	attrib * a = a_find(u->attribs, &at_private);
-	if (!a && !str) return;
+
+	if(str == NULL) {
+		if(a) a_remove(&u->attribs, a);
+		return;
+	}
 	if (!a) a = a_add(&u->attribs, a_new(&at_private));
 	if (a->data.v) free(a->data.v);
 	a->data.v = strdup(str);