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

Fehler bei letzter Änderung in getunit()

This commit is contained in:
Enno Rehling 2004-07-09 14:05:14 +00:00
parent 0e98c36075
commit aac3605463
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/kernel/eressea.c
View File

@ -1654,16 +1654,13 @@ boolean getunitpeasants;
unit * unit *
getunitg(const region * r, const faction * f) getunitg(const region * r, const faction * f)
{ {
int n; int n = read_unitid(f, r);
getunitpeasants = 0;
n = read_unitid(f, r);
if (n == 0) { if (n == 0) {
getunitpeasants = 1; getunitpeasants = 1;
return NULL; return NULL;
} }
getunitpeasants = 0;
if (n < 0) return 0; if (n < 0) return 0;
return findunit(n); return findunit(n);
@ -1672,28 +1669,26 @@ getunitg(const region * r, const faction * f)
unit * unit *
getunit(const region * r, const faction * f) getunit(const region * r, const faction * f)
{ {
int n; int n = read_unitid(f, r);;
unit *u2; unit *u2;
getunitpeasants = 0;
n = read_unitid(f, r);
if (n == 0) { if (n == 0) {
getunitpeasants = 1; getunitpeasants = 1;
return NULL; return NULL;
} }
getunitpeasants = 0;
if (n < 0) return 0; if (n < 0) return 0;
for (u2 = r->units; u2; u2 = u2->next) { u2 = findunit(n);
if (u2->no == n) { if (u2!=NULL && u2->region==r) {
/* there used to be a '|| u2->number>0' condition here, but it got /* there used to be a 'u2->flags & UFL_ISNEW || u2->number>0' condition
* removed because of a bug that made units disappear: * here, but it got removed because of a bug that made units disappear:
* http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000172 * http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000172
*/ */
if (u2->flags & UFL_ISNEW) return u2; return u2;
}
} }
return 0; return NULL;
} }
/* - String Listen --------------------------------------------- */ /* - String Listen --------------------------------------------- */