]> git.pond.sub.org Git - empserver/commitdiff
Fix tend to refuse tending civilians to foreign ships
authorMarkus Armbruster <armbru@pond.sub.org>
Mon, 11 Jun 2012 18:18:08 +0000 (20:18 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 24 Jun 2012 06:49:34 +0000 (08:49 +0200)
Broken when Chainsaw 2 added tending to allies.

src/lib/commands/tend.c

index 639a19d03411f06702844b390ae3c2679169e372..85061be746cc1091baecb4924569c6a27e7a2c89 100644 (file)
@@ -140,6 +140,8 @@ tend(void)
            if (tender.shp_x != target.shp_x ||
                tender.shp_y != target.shp_y)
                continue;
+           if (ip->i_uid == I_CIVIL && tender.shp_own != target.shp_own)
+               continue;
            ontarget = target.shp_item[ip->i_uid];
            vbase = &mchr[(int)target.shp_type];
            maxtarget = vbase->m_item[ip->i_uid];