From defd870cd106a8cd2e5bfb738a5c2be1f55e2ca0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 23 Nov 2015 16:48:05 +0100 Subject: [PATCH] https://bugs.eressea.de/view.php?id=2163 Fix order of Arguments when checking for defensive building. Solthar reminds us that good variable names are good. --- src/monsters.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/monsters.c b/src/monsters.c index 432e4bb96..d6deaaab1 100644 --- a/src/monsters.c +++ b/src/monsters.c @@ -155,7 +155,7 @@ static order *monster_attack(unit * u, const unit * target) return create_order(K_ATTACK, u->faction->locale, "%i", target->no); } -static order *get_money_for_dragon(region * r, unit * u, int wanted) +static order *get_money_for_dragon(region * r, unit * udragon, int wanted) { int n; bool attacks = attack_chance > 0.0; @@ -163,7 +163,7 @@ static order *get_money_for_dragon(region * r, unit * u, int wanted) /* falls genug geld in der region ist, treiben wir steuern ein. */ if (rmoney(r) >= wanted) { /* 5% chance, dass der drache aus einer laune raus attackiert */ - if (!attacks || chance(1.0 - u_race(u)->aggression)) { + if (!attacks || chance(1.0 - u_race(udragon)->aggression)) { /* Drachen haben in E3 und E4 keine Einnahmen. Neuer Befehl Pluendern erstmal nur fuer Monster?*/ return create_order(K_LOOT, default_locale, NULL); } @@ -172,15 +172,15 @@ static order *get_money_for_dragon(region * r, unit * u, int wanted) /* falls der drache launisch ist, oder das regionssilber knapp, greift er alle an * und holt sich Silber von Einheiten, vorausgesetzt er bewacht bereits */ n = 0; - if (attacks && is_guard(u, GUARD_TAX)) { - unit *u2; - for (u2 = r->units; u2; u2 = u2->next) { - if (u2->faction != u->faction && cansee(u->faction, r, u2, 0) && !in_safe_building(u, u2)) { - int m = get_money(u2); + if (attacks && is_guard(udragon, GUARD_TAX)) { + unit *u; + for (u = r->units; u; u = u->next) { + if (u->faction != udragon->faction && cansee(udragon->faction, r, u, 0) && !in_safe_building(u, udragon)) { + int m = get_money(u); if (m != 0) { - order *ord = monster_attack(u, u2); + order *ord = monster_attack(udragon, u); if (ord) { - addlist(&u->orders, ord); + addlist(&udragon->orders, ord); n += m; } }