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

DEFAULT funktioniert wieder.

This commit is contained in:
Enno Rehling 2005-05-29 15:29:52 +00:00
parent 8ae73a0ae0
commit bb4498db5d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3696,13 +3696,15 @@ monthly_healing(void)
} }
} }
#ifdef LASTORDER
static void static void
defaultorders (void) defaultorders (void)
{ {
region *r; region *r;
return; return;
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) {
order ** ordp = &u->orders; order ** ordp = &u->orders;
@ -3713,7 +3715,15 @@ defaultorders (void)
init_tokens(ord); init_tokens(ord);
skip_token(); /* skip the keyword */ skip_token(); /* skip the keyword */
cmd = strdup(getstrtoken()); cmd = strdup(getstrtoken());
#ifdef LASTORDER
set_order(&u->lastorder, parse_order(cmd, u->faction->locale)); set_order(&u->lastorder, parse_order(cmd, u->faction->locale));
#else
if (!neworders) {
neworders = true;
free_orders(&u->old_orders);
}
addlist(&u->old_orders, parse_order(cmd, u->faction->locale));
#endif
free(cmd); free(cmd);
*ordp = ord->next; *ordp = ord->next;
ord->next = NULL; ord->next = NULL;
@ -3724,7 +3734,6 @@ defaultorders (void)
} }
} }
} }
#endif
/* ************************************************************ */ /* ************************************************************ */
/* GANZ WICHTIG! ALLE GEÄNDERTEN SPRÜCHE NEU ANZEIGEN */ /* GANZ WICHTIG! ALLE GEÄNDERTEN SPRÜCHE NEU ANZEIGEN */
@ -3952,10 +3961,8 @@ processorders (void)
monthly_healing(); monthly_healing();
regeneration_magiepunkte(); regeneration_magiepunkte();
#ifdef LASTORDER
puts(" - Defaults setzen"); puts(" - Defaults setzen");
defaultorders(); defaultorders();
#endif
puts(" - Unterhaltskosten, Nachfrage, Seuchen, Wachstum, Auswanderung"); puts(" - Unterhaltskosten, Nachfrage, Seuchen, Wachstum, Auswanderung");
demographics(); demographics();