forked from github/server
bugfix owners III
This commit is contained in:
parent
ee48ac4893
commit
fabbf9a3a3
|
@ -1,6 +1,6 @@
|
||||||
/* vi: set ts=2:
|
/* vi: set ts=2:
|
||||||
*
|
*
|
||||||
* $Id: laws.c,v 1.14 2001/02/11 12:56:27 enno Exp $
|
* $Id: laws.c,v 1.15 2001/02/11 13:25:19 enno Exp $
|
||||||
* Eressea PB(E)M host Copyright (C) 1998-2000
|
* Eressea PB(E)M host Copyright (C) 1998-2000
|
||||||
* Christian Schlittchen (corwin@amber.kn-bremen.de)
|
* Christian Schlittchen (corwin@amber.kn-bremen.de)
|
||||||
* Katja Zedel (katze@felidae.kn-bremen.de)
|
* Katja Zedel (katze@felidae.kn-bremen.de)
|
||||||
|
@ -2105,11 +2105,6 @@ sinkships(void)
|
||||||
#include "eressea.h"
|
#include "eressea.h"
|
||||||
#include "build.h"
|
#include "build.h"
|
||||||
|
|
||||||
void *
|
|
||||||
resolve_ship(void * id) {
|
|
||||||
return findship((int)id);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
reorder_owners(region * r)
|
reorder_owners(region * r)
|
||||||
{
|
{
|
||||||
|
@ -2145,7 +2140,10 @@ reorder_owners(region * r)
|
||||||
unit * u = *useek;
|
unit * u = *useek;
|
||||||
assert(!u->building);
|
assert(!u->building);
|
||||||
if (u->ship==NULL) {
|
if (u->ship==NULL) {
|
||||||
assert(!fval(u, FL_OWNER));
|
if (fval(u, FL_OWNER)) {
|
||||||
|
fprintf(stderr, "WARNING: Einheit %s war Besitzer von nichts.\n", unitname(u));
|
||||||
|
freset(u, FL_OWNER);
|
||||||
|
}
|
||||||
*useek = u->next;
|
*useek = u->next;
|
||||||
useek = &u->next;
|
useek = &u->next;
|
||||||
u->next = *up;
|
u->next = *up;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* vi: set ts=2:
|
/* vi: set ts=2:
|
||||||
*
|
*
|
||||||
* $Id: laws.h,v 1.3 2001/02/10 10:40:10 enno Exp $
|
* $Id: laws.h,v 1.4 2001/02/11 13:25:19 enno Exp $
|
||||||
* Eressea PB(E)M host Copyright (C) 1998-2000
|
* Eressea PB(E)M host Copyright (C) 1998-2000
|
||||||
* Christian Schlittchen (corwin@amber.kn-bremen.de)
|
* Christian Schlittchen (corwin@amber.kn-bremen.de)
|
||||||
* Katja Zedel (katze@felidae.kn-bremen.de)
|
* Katja Zedel (katze@felidae.kn-bremen.de)
|
||||||
|
@ -39,8 +39,6 @@ extern void sinkships(void);
|
||||||
/* eressea-specific. put somewhere else, please. */
|
/* eressea-specific. put somewhere else, please. */
|
||||||
#include "resolve.h"
|
#include "resolve.h"
|
||||||
|
|
||||||
extern void * resolve_ship(void * data);
|
|
||||||
|
|
||||||
void processorders(void);
|
void processorders(void);
|
||||||
extern int count_migrants (const struct faction * f);
|
extern int count_migrants (const struct faction * f);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue