Complete.Org: Mailing Lists: Archives: freeciv-dev: February 2005:
[Freeciv-Dev] (PR#12089) call city_support with the rest of the full-ref
Home

[Freeciv-Dev] (PR#12089) call city_support with the rest of the full-ref

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] (PR#12089) call city_support with the rest of the full-refresh functions
From: "Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>
Date: Thu, 3 Feb 2005 01:12:07 -0800
Reply-to: bugs@xxxxxxxxxxx

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

This patch moves the call of city_support:

- It can be called earlier (so the support values can be used when 
calculating production).
- It should only be called for a full refresh.

-jason

? newgrid.fig
? newgrid.png
? doc/isogrid.fig
Index: common/city.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.c,v
retrieving revision 1.311
diff -u -r1.311 city.c
--- common/city.c       3 Feb 2005 08:38:55 -0000       1.311
+++ common/city.c       3 Feb 2005 08:52:02 -0000
@@ -2233,6 +2233,7 @@
   if (full_refresh) {
     set_city_bonuses(pcity);   /* Calculate the bonus[] array values. */
     set_city_tile_output(pcity); /* Calculate the tile_output[] values. */
+    city_support(pcity, send_unit_info); /* manage settlers, and units */
   }
   get_citizen_output(pcity, pcity->citizen_base); /* Calculate output from 
citizens. */
   set_city_production(pcity);
@@ -2240,7 +2241,6 @@
   pcity->pollution = city_pollution(pcity, pcity->prod[O_SHIELD]);
   citizen_happy_luxury(pcity); /* with our new found luxuries */
   citizen_content_buildings(pcity);    /* temple cathedral colosseum */
-  city_support(pcity, send_unit_info); /* manage settlers, and units */
   citizen_happy_units(pcity); /* Martial law & unrest from units */
   citizen_happy_wonders(pcity);        /* happy wonders & fundamentalism */
   unhappy_city_check(pcity);

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#12089) call city_support with the rest of the full-refresh functions, Jason Short <=