Complete.Org: Mailing Lists: Archives: freeciv-dev: September 2004:
[Freeciv-Dev] (PR#10319) [Patch] Sanitycheck for alliances
Home

[Freeciv-Dev] (PR#10319) [Patch] Sanitycheck for alliances

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] (PR#10319) [Patch] Sanitycheck for alliances
From: "Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx>
Date: Sat, 25 Sep 2004 03:41:15 -0700
Reply-to: rt@xxxxxxxxxxx

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10319 >


  Sanitycheck for alliance structures. Hopefully this helps tracking #10208.


  - Caz


diff -Nurd -X.diff_ignore freeciv/server/sanitycheck.c 
freeciv/server/sanitycheck.c
--- freeciv/server/sanitycheck.c        2004-09-24 22:50:12.531250000 +0300
+++ freeciv/server/sanitycheck.c        2004-09-25 13:30:06.906250000 +0300
@@ -347,9 +347,13 @@
     players_iterate(pplayer2) {
       assert(pplayer->diplstates[pplayer2->player_no].type
             == pplayer2->diplstates[pplayer->player_no].type);
-      if (pplayer->diplstates[pplayer2->player_no].type == DS_CEASEFIRE)
+      if (pplayer->diplstates[pplayer2->player_no].type == DS_CEASEFIRE) {
        assert(pplayer->diplstates[pplayer2->player_no].turns_left
               == pplayer2->diplstates[pplayer->player_no].turns_left);
+      }
+      if (pplayers_allied(pplayer, pplayer2)) {
+        assert(pplayer_can_ally(pplayer, pplayer2));
+      }
     } players_iterate_end;
 
     if (pplayer->revolution_finishes == -1) {

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#10319) [Patch] Sanitycheck for alliances, Marko Lindqvist <=