Author: cazfi
Date: Mon Sep 14 19:55:13 2015
New Revision: 29885

URL: http://svn.gna.org/viewcvs/freeciv?rev=29885&view=rev
Log:
Consider players that have armistice to be peaceful towards each other.

See bug #23866

Modified:
    trunk/common/player.c

Modified: trunk/common/player.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/player.c?rev=29885&r1=29884&r2=29885&view=diff
==============================================================================
--- trunk/common/player.c       (original)
+++ trunk/common/player.c       Mon Sep 14 19:55:13 2015
@@ -1293,7 +1293,9 @@
   if (is_barbarian(pplayer) || is_barbarian(pplayer2)) {
     return FALSE;
   }
-  return (ds == DS_PEACE || ds == DS_ALLIANCE || ds == DS_TEAM);
+
+  return (ds == DS_PEACE || ds == DS_ALLIANCE
+          || ds == DS_ARMISTICE || ds == DS_TEAM);
 }
 
 /****************************************************************************


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to