[Freeciv-Dev] (PR#12301) auto_arrange_workers problem

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

Oops, here's the "correct" patch for 2.0.

-jason

Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.267.2.10
diff -u -r1.267.2.10 cityturn.c
--- server/cityturn.c   21 Dec 2004 22:57:26 -0000      1.267.2.10
+++ server/cityturn.c   27 Feb 2005 18:22:51 -0000
@@ -270,12 +270,6 @@
       cm_query_result(pcity, &cmp, &cmr);
 
       if (!cmr.found_a_valid) {
-       cmp.minimal_surplus[FOOD] = -(pcity->food_stock);
-       cmp.minimal_surplus[TRADE] = -FC_INFINITY;
-       cm_query_result(pcity, &cmp, &cmr);
-      }
-
-      if (!cmr.found_a_valid) {
        /* Emergency management.  Get _some_ result.  This doesn't use
         * cm_init_emergency_parameter so we can keep the factors from
         * above. */