Author: sveinung
Date: Mon Nov 9 08:37:46 2015
New Revision: 30490
URL: http://svn.gna.org/viewcvs/freeciv?rev=30490&view=rev
Log:
Revert patch #6523 from the 2.5 branch
Requested by Marko Lindqvist <cazfi>
Modified:
branches/S2_5/server/sanitycheck.c
Modified: branches/S2_5/server/sanitycheck.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/sanitycheck.c?rev=30490&r1=30489&r2=30490&view=diff
==============================================================================
--- branches/S2_5/server/sanitycheck.c (original)
+++ branches/S2_5/server/sanitycheck.c Mon Nov 9 08:37:46 2015
@@ -472,8 +472,7 @@
state1 = player_diplstate_get(pplayer, pplayer2);
state2 = player_diplstate_get(pplayer2, pplayer);
SANITY_CHECK(state1->type == state2->type);
- if (state1->type == DS_CEASEFIRE
- || state1->type == DS_ARMISTICE) {
+ if (state1->type == DS_CEASEFIRE) {
SANITY_CHECK(state1->turns_left == state2->turns_left);
}
if (state1->type == DS_TEAM) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
