<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39785 >
Committed trunk revision 13849.
Committed S2_2 revision 13850.
Committed S2_1 revision 13851, authorized by Markstedt.
Here's the trivial S2_1 patch for posterity:
Index: server/cityturn.c
===================================================================
--- server/cityturn.c (revision 13850)
+++ server/cityturn.c (working copy)
@@ -1048,7 +1048,7 @@
}
/**************************************************************************
-...
+ Returns FALSE when the city is removed, TRUE otherwise.
**************************************************************************/
static bool city_build_building(struct player *pplayer, struct city *pcity)
{
@@ -1066,8 +1066,10 @@
pcity->before_change_shields = 0;
pcity->shield_stock = 0;
choose_build_target(pplayer, pcity);
+ return TRUE;
}
upgrade_building_prod(pcity);
+
if (!can_build_improvement(pcity, id)) {
notify_player(pplayer, pcity->tile, E_CITY_CANTBUILD,
_("%s is building %s, which "
@@ -1261,8 +1263,7 @@
}
/**************************************************************************
-return 0 if the city is removed
-return 1 otherwise
+ Returns FALSE when the city is removed, TRUE otherwise.
**************************************************************************/
static bool city_build_stuff(struct player *pplayer, struct city *pcity)
{
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
