Complete.Org: Mailing Lists: Archives: freeciv-dev: February 2006:
[Freeciv-Dev] (PR#15169) cannot claim my own island - cannot found citie
Home

[Freeciv-Dev] (PR#15169) cannot claim my own island - cannot found citie

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] (PR#15169) cannot claim my own island - cannot found cities in enemy borders
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 15 Feb 2006 18:51:10 -0800
Reply-to: bugs@xxxxxxxxxxx

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=15169 >

This patch allows founding of cities within enemy borders.

-jason

Index: common/city.c
===================================================================
--- common/city.c       (revision 11594)
+++ common/city.c       (working copy)
@@ -751,9 +751,10 @@
     return FALSE;
   }
 
-  if (punit && ptile->owner && ptile->owner != punit->owner) {
+  if (punit && ptile->owner && ptile->owner != punit->owner
+      && !pplayers_ate_war(ptile->owner, punit->owner)) {
     /* Cannot steal borders by settling. This has to be settled by
-     * force of arms. */
+     * force of arms.  If you're at war it is allowed. */
     return FALSE;
   }
 

[Prev in Thread] Current Thread [Next in Thread]