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

http://eressea.upb.de/mantis/view.php?id=565 

Neue Defaults entfernen alte lange Befehle, nicht kurze.
This commit is contained in:
Enno Rehling 2005-07-16 17:18:15 +00:00
parent 1b07d7513b
commit c0fcf15184
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3767,16 +3767,31 @@ monthly_healing(void)
} }
} }
static void
remove_exclusive(order ** ordp)
{
while (*ordp) {
order * ord = *ordp;
if (is_exclusive(ord)) {
*ordp = ord->next;
ord->next = NULL;
free_order(ord);
} else {
ordp = &ord->next;
}
}
}
static void static void
defaultorders (void) defaultorders (void)
{ {
region *r; region *r;
for (r=regions;r;r=r->next) { for (r=regions;r;r=r->next) {
#ifndef LASTORDER
boolean neworders = false;
#endif
unit *u; unit *u;
for (u=r->units;u;u=u->next) { for (u=r->units;u;u=u->next) {
#ifndef LASTORDER
boolean neworders = false;
#endif
order ** ordp = &u->orders; order ** ordp = &u->orders;
while (*ordp!=NULL) { while (*ordp!=NULL) {
order * ord = *ordp; order * ord = *ordp;
@ -3791,8 +3806,10 @@ defaultorders (void)
if (new_order) set_order(&u->lastorder, new_order); if (new_order) set_order(&u->lastorder, new_order);
#else #else
if (!neworders) { if (!neworders) {
/* lange Befehle aus orders und old_orders löschen zu gunsten des neuen */
remove_exclusive(&u->orders);
remove_exclusive(&u->old_orders);
neworders = true; neworders = true;
free_orders(&u->old_orders);
} }
if (new_order) addlist(&u->old_orders, new_order); if (new_order) addlist(&u->old_orders, new_order);
#endif #endif