[Freeciv-Dev] (PR#12258) AIs cannot handle disorder anymore

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

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

Recent changes to CM settings made the AI rather helpless in the face of
mass unhappiness. Patch attached should help. Although the AI also needs
other improvements in this area.

  - Per

Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.296
diff -u -r1.296 cityturn.c
--- server/cityturn.c   14 Feb 2005 22:52:41 -0000      1.296
+++ server/cityturn.c   15 Feb 2005 01:13:42 -0000
@@ -262,7 +262,7 @@
                                   MIN(pcity->surplus[o], 0));
     } output_type_iterate_end;
     cmp.require_happy = FALSE;
-    cmp.allow_disorder = TRUE;
+    cmp.allow_disorder = city_owner(pcity)->ai.control ? FALSE : TRUE;
     cm_query_result(pcity, &cmp, &cmr);
   }
   if (!cmr.found_a_valid) {