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

This transaction appears to have no content
The original patch introduces a nasty bug where you can't enter your
allies' territory. The fix is attached.
Index: common/player.c
===================================================================
--- common/player.c	(revision 12929)
+++ common/player.c	(working copy)
@@ -741,7 +741,7 @@
 			const struct player *pplayer2)
 {
   assert(pplayer1 != pplayer2);
-  return pplayers_in_peace(pplayer1, pplayer2);
+  return pplayers_in_peace(pplayer1, pplayer2) && !pplayers_allied(pplayer1, pplayer2);
 }
 
 /***************************************************************

Attachment: pgp3zcQJ5uReT.pgp
Description: PGP signature

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

Reply via email to