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

move attribut deaktiviert, ageing gefixt.

This commit is contained in:
Enno Rehling 2002-04-07 10:26:28 +00:00
parent 45c51f71bf
commit 65187b2324
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/attributes/moved.c
View File

@ -21,7 +21,8 @@
static int static int
age_moved(attrib * a) age_moved(attrib * a)
{ {
return a->data.i-- > 0; --a->data.i;
return a->data.i > 0;
} }
static void static void
@ -53,7 +54,7 @@ set_moved(attrib ** alist)
{ {
attrib * a = a_find(*alist, &at_moved); attrib * a = a_find(*alist, &at_moved);
if (a==NULL) a = a_add(alist, a_new(&at_moved)); if (a==NULL) a = a_add(alist, a_new(&at_moved));
a->data.i = 1; a->data.i = 2;
} }
void void

2
src/common/kernel/unit.c
View File

@ -654,7 +654,9 @@ move_unit(unit * u, region * r, unit ** ulist)
if (u->region!=NULL) maxhp = unit_max_hp(u); if (u->region!=NULL) maxhp = unit_max_hp(u);
if (!ulist) ulist = (&r->units); if (!ulist) ulist = (&r->units);
if (u->region) { if (u->region) {
#ifdef DELAYED_OFFENSE
set_moved(&u->attribs); set_moved(&u->attribs);
#endif
setguard(u, GUARD_NONE); setguard(u, GUARD_NONE);
fset(u, FL_MOVED); fset(u, FL_MOVED);
if (u->ship || u->building) leave(u->region, u); if (u->ship || u->building) leave(u->region, u);

2
src/common/util/attrib.c
View File

@ -264,7 +264,7 @@ a_read(FILE * f, attrib ** attribs)
a_add(attribs, na); a_add(attribs, na);
break; break;
case AT_READ_FAIL: case AT_READ_FAIL:
log_warning(("reading attribute %s failed.", zText)); log_warning(("reading attribute %s failed.\n", zText));
a_free(na); a_free(na);
break; break;
default: default:

2
src/common/util/event.c
View File

@ -55,7 +55,7 @@ read_triggers(FILE * F, trigger ** tp)
tp = &(*tp)->next; tp = &(*tp)->next;
break; break;
case AT_READ_FAIL: case AT_READ_FAIL:
log_warning(("reading trigger for %s failed.", ttype->name)); log_warning(("reading trigger for %s failed.\n", ttype->name));
t_free(*tp); t_free(*tp);
*tp = NULL; *tp = NULL;
break; break;