Author: cazfi
Date: Thu May 14 23:27:27 2015
New Revision: 29085
URL: http://svn.gna.org/viewcvs/freeciv?rev=29085&view=rev
Log:
Make sure that auto_arrange_worker() creates worker placement result for the
correct
city radius.
Based on report by Jacew
See bug #23591
Modified:
branches/S2_6/server/cityturn.c
Modified: branches/S2_6/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=29085&r1=29084&r2=29085&view=diff
==============================================================================
--- branches/S2_6/server/cityturn.c (original)
+++ branches/S2_6/server/cityturn.c Thu May 14 23:27:27 2015
@@ -304,8 +304,6 @@
}
TIMING_LOG(AIT_CITIZEN_ARRANGE, TIMER_START);
- cmr = cm_result_new(pcity);
-
/* Freeze the workers and make sure all the tiles around the city
* are up to date. Then thaw, but hackishly make sure that thaw
* doesn't call us recursively, which would waste time. */
@@ -365,6 +363,9 @@
cmp.minimal_surplus[O_LUXURY] = 0;
cmp.minimal_surplus[O_SCIENCE] = 0;
+ /* This must be after city_refresh() so that the result gets created for the
right
+ * city radius */
+ cmr = cm_result_new(pcity);
cm_query_result(pcity, &cmp, cmr);
if (!cmr->found_a_valid) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
