[Freeciv-Dev] patch: fix rapture-triggeted city growth (PR#251)

[mike_jing@xxxxxxxxx]

OK, this is the LAST time this patch will be submitted.  No, seriously.  I 
added a couple of more comments and fixed a spelling error.  Sorry about 
that.
This patch should be applied immediately after the shield surplus patch I 
just submited.  Both are against the latest CVS (as of Jan 2, 2000).
Mike

-----------------------------------------------------

The change made on Jan 18 to not empty the food stock during 
rapture-triggeted city growth didn't work, and also introduced several other 
bugs, e.g., the code for rapture tracking is broken because city size is 
increased too early; city could grow and then starve during the same turn 
because the food stock is still emptied and the code for checking it is 
executed twice.
This patch fixes the above problems by changing city_populate() and 
city_increase_size() to include the case of "rapture growth".  It also added 
a small function city_rapture_grow() in city.c to make things easier.  Now 
everything should work as advertised.  The food stock is no longer emptied 
for rapture-triggered growth.
______________________________________________________
Get Your Private, Free Email at http://www.hotmail.com

rapture_growth_final.diff.txt
Description: Text document