From 58c88ccd82f64bb2bcda5aeda98a45c3b2f208cf Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 17 Feb 2001 16:07:03 +0000 Subject: [PATCH] Owner Verification war buggy. fixed --- src/common/gamecode/laws.c | 6 +++--- src/eressea/korrektur.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index d73469190..dab8528fc 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.23 2001/02/13 19:22:48 corwin Exp $ + * $Id: laws.c,v 1.24 2001/02/17 16:07:02 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -2133,7 +2133,7 @@ reorder_owners(region * r) if (fval(u, FL_OWNER)) { unit * nu = *ubegin; insert=ubegin; - if (nu && nu->building==u->building && fval(nu, FL_OWNER)) { + if (nu!=u && nu->building==u->building && fval(nu, FL_OWNER)) { log_error(("[reorder_owners] %s hat mehrere Besitzer mit FL_OWNER.\n", buildingname(nu->building))); freset(nu, FL_OWNER); } @@ -2182,7 +2182,7 @@ reorder_owners(region * r) if (fval(u, FL_OWNER)) { unit * nu = *ubegin; insert = ubegin; - if (nu && nu->ship==u->ship && fval(nu, FL_OWNER)) { + if (nu!=u && nu->ship==u->ship && fval(nu, FL_OWNER)) { log_error(("[reorder_owners] %s hat mehrere Besitzer mit FL_OWNER.\n", shipname(nu->ship))); freset(nu, FL_OWNER); } diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 1f3c0bcf4..2ad991d83 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: korrektur.c,v 1.25 2001/02/17 14:47:43 enno Exp $ + * $Id: korrektur.c,v 1.26 2001/02/17 16:07:03 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -1953,6 +1953,7 @@ set_atgm(faction * f) if (!f) return; while (p) { a_add(&f->attribs, make_gm(p)); + p = p->next; } }