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

Monster attackieren keine Einheiten in Gebäuden.

This commit is contained in:
Enno Rehling 2014-08-19 15:31:16 +02:00
parent b385bfc4d2
commit 5c7b93d0ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/monsters.c
View File

@ -171,7 +171,7 @@ 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 */ /* falls der drache launisch ist, oder das regionssilber knapp, greift er alle an */
n = 0; n = 0;
for (u2 = r->units; u2; u2 = u2->next) { for (u2 = r->units; u2; u2 = u2->next) {
if (u2->faction != u->faction && cansee(u->faction, r, u2, 0)) { if (inside_building(u2)!=u->building && u2->faction != u->faction && cansee(u->faction, r, u2, 0)) {
int m = get_money(u2); int m = get_money(u2);
if (m == 0 || is_guard(u2, GUARD_TAX)) if (m == 0 || is_guard(u2, GUARD_TAX))
continue; continue;
@ -533,7 +533,7 @@ static void monster_attacks(unit * u)
unit *u2; unit *u2;
for (u2 = r->units; u2; u2 = u2->next) { for (u2 = r->units; u2; u2 = u2->next) {
if (cansee(u->faction, r, u2, 0) && u2->faction != u->faction if (cansee(u->faction, r, u2, 0) && u2->faction != u->faction && inside_building(u2)!=u->building
&& chance(0.75)) { && chance(0.75)) {
order *ord = monster_attack(u, u2); order *ord = monster_attack(u, u2);
if (ord) if (ord)