[Freeciv-Dev] Re: (PR#6300) Another current cvs civserver core

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

On Fri, 26 Sep 2003, Paul Zastoupil wrote:
> civserver: cityturn.c:230: auto_arrange_workers: Assertion
> `cmr.found_a_valid' failed.

Your city had too much upkeep. Neither the CMA frontend nor CM in the
server handles more than -20 gold income in the city. The attached patch
fixes this for the CM in the server.

  - Per

Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.225
diff -u -r1.225 cityturn.c
--- server/cityturn.c   22 Sep 2003 16:04:03 -0000      1.225
+++ server/cityturn.c   27 Sep 2003 11:38:18 -0000
@@ -200,7 +200,7 @@
   if (!cmr.found_a_valid) {
     cmp.minimal_surplus[FOOD] = 0;
     cmp.minimal_surplus[SHIELD] = 0;
-    cmp.minimal_surplus[GOLD] = -20;
+    cmp.minimal_surplus[GOLD] = -FC_INFINITY;
     cm_query_result(pcity, &cmp, &cmr);
   }
 
@@ -219,8 +219,6 @@
     CITY_LOG(LOG_DEBUG, pcity, "emergency management");
     cmp.minimal_surplus[FOOD] = -20;
     cmp.minimal_surplus[SHIELD] = -20;
-    cmp.minimal_surplus[TRADE] = -20;
-    cmp.minimal_surplus[GOLD] = -20;
     cmp.minimal_surplus[LUXURY] = -20;
     cmp.minimal_surplus[SCIENCE] = -20;
     cmp.allow_disorder = TRUE;