Author: cazfi
Date: Tue Nov 1 09:23:08 2016
New Revision: 34306
URL: http://svn.gna.org/viewcvs/freeciv?rev=34306&view=rev
Log:
Present treaty cancellation button in sdl-clients when it should.
Reported by Jacob Nevins <jtn>
See bug #25245
Modified:
branches/S2_5/client/gui-sdl/diplodlg.c
branches/S2_5/common/player.c
Modified: branches/S2_5/client/gui-sdl/diplodlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/diplodlg.c?rev=34306&r1=34305&r2=34306&view=diff
==============================================================================
--- branches/S2_5/client/gui-sdl/diplodlg.c (original)
+++ branches/S2_5/client/gui-sdl/diplodlg.c Tue Nov 1 09:23:08 2016
@@ -1527,7 +1527,7 @@
area.h += pText->h + adj_size(15);
can_toward_war = can_client_issue_orders()
- && pplayer_can_cancel_treaty(client_player(), pPlayer);
+ && pplayer_can_cancel_treaty(client_player(), pPlayer) == DIPL_OK;
if (can_toward_war) {
if (type == DS_ARMISTICE) {
Modified: branches/S2_5/common/player.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/player.c?rev=34306&r1=34305&r2=34306&view=diff
==============================================================================
--- branches/S2_5/common/player.c (original)
+++ branches/S2_5/common/player.c Tue Nov 1 09:23:08 2016
@@ -92,8 +92,6 @@
}
/***************************************************************
- Returns true iff p1 can cancel treaty on p2.
-
The senate may not allow you to break the treaty. In this
case you must first dissolve the senate then you can break
it. This is waived if you have statue of liberty since you
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
