Author: cazfi
Date: Mon Sep 14 19:55:22 2015
New Revision: 29886
URL: http://svn.gna.org/viewcvs/freeciv?rev=29886&view=rev
Log:
Consider players that have armistice to be peaceful towards each other.
See bug #23866
Modified:
branches/S2_6/common/player.c
Modified: branches/S2_6/common/player.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/player.c?rev=29886&r1=29885&r2=29886&view=diff
==============================================================================
--- branches/S2_6/common/player.c (original)
+++ branches/S2_6/common/player.c Mon Sep 14 19:55:22 2015
@@ -1292,7 +1292,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
