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

Merge branch 'Hafen_und_Helfe_bewache' into Hafen2

This commit is contained in:
CTD 2014-10-02 18:09:52 +02:00
parent a78daad4d8 ee77a15f50
commit 6f10ee828c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/move.c
View File

@ -696,6 +696,9 @@ int check_ship_allowed(struct ship *sh, const region * r)
} }
if (bt_harbour && buildingtype_exists(r, bt_harbour, true)) { if (bt_harbour && buildingtype_exists(r, bt_harbour, true)) {
unit* hafenmeister = NULL;
hafenmeister = owner_buildingtyp(r, bt_harbour);
if ((sh->_owner->faction == hafenmeister->faction) || (ucontact(sh->_owner, hafenmeister)) || (alliedunit(sh->_owner, hafenmeister->faction, HELP_GUARD)))
return SA_HARBOUR; return SA_HARBOUR;
} }
if (fval(r->terrain, SEA_REGION)) { if (fval(r->terrain, SEA_REGION)) {