Author: sveinung
Date: Mon Nov  9 08:41:12 2015
New Revision: 30491

URL: http://svn.gna.org/viewcvs/freeciv?rev=30491&view=rev
Log:
Give reason to cancel to the correct player

When a cease fire expires to war any third party allied to both players
will automatically have his alliance to both canceled. This is a valid
reason to cancel an alliance. Give the reason to the correct player.

See bug #24038

Modified:
    branches/S2_5/server/srv_main.c

Modified: branches/S2_5/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/srv_main.c?rev=30491&r1=30490&r2=30491&view=diff
==============================================================================
--- branches/S2_5/server/srv_main.c     (original)
+++ branches/S2_5/server/srv_main.c     Mon Nov  9 08:41:12 2015
@@ -762,7 +762,7 @@
                               player_name(plr1),
                               player_name(plr2));
                 player_diplstate_get(plr3, plr1)->has_reason_to_cancel = TRUE;
-                player_diplstate_get(plr2, plr2)->has_reason_to_cancel = TRUE;
+                player_diplstate_get(plr3, plr2)->has_reason_to_cancel = TRUE;
                 handle_diplomacy_cancel_pact(plr3, player_number(plr1), 
CLAUSE_ALLIANCE);
                 handle_diplomacy_cancel_pact(plr3, player_number(plr2), 
CLAUSE_ALLIANCE);
               }


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

Reply via email to