Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix owners III

This commit is contained in:
Enno Rehling 2001-02-11 13:25:19 +00:00
parent ee48ac4893
commit fabbf9a3a3
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/gamecode/laws.c
View File

@ -1,6 +1,6 @@
/* 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
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -2105,11 +2105,6 @@ sinkships(void)
#include "eressea.h"
#include "build.h"
void *
resolve_ship(void * id) {
return findship((int)id);
}
static void
reorder_owners(region * r)
{
@ -2145,7 +2140,10 @@ reorder_owners(region * r)
unit * u = *useek;
assert(!u->building);
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;
u->next = *up;

4
src/common/gamecode/laws.h
View File

@ -1,6 +1,6 @@
/* 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
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -39,8 +39,6 @@ extern void sinkships(void);
/* eressea-specific. put somewhere else, please. */
#include "resolve.h"
extern void * resolve_ship(void * data);
void processorders(void);
extern int count_migrants (const struct faction * f);