[Freeciv-Dev] Re: (PR#12668) Change how to win the game

["Per I. Mathisen" <per@xxxxxxxxxxx>]

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

On Sun, 24 Apr 2005, Per I. Mathisen wrote:
> If we are to keep allied victories, this additional patch is needed.

Ignore that patch. Here is a correct one.

  - Per

Index: server/srv_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/srv_main.c,v
retrieving revision 1.245
diff -u -r1.245 srv_main.c
--- server/srv_main.c   13 Apr 2005 18:41:11 -0000      1.245
+++ server/srv_main.c   24 Apr 2005 22:34:08 -0000
@@ -276,11 +288,12 @@
   /* quit if all remaining players are allied to each other */
   all_allied = TRUE;
   players_iterate(pplayer) {
-    if (!pplayer->is_alive) {
-      continue;
-    }
     players_iterate(aplayer) {
-      if (!pplayers_allied(pplayer, aplayer) && aplayer->is_alive) {
+      if (!pplayers_allied(pplayer, aplayer)
+          && pplayer->is_alive
+          && aplayer->is_alive
+          && !pplayer->surrendered
+          && !aplayer->surrendered) {
         all_allied = FALSE;
         break;
       }