<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40421 >
Overzealous assert goes off at client end when diuplomat investigates
enemy city. Fix attached.
- ML
diff -Nurd -X.diff_ignore freeciv/common/city.c freeciv/common/city.c
--- freeciv/common/city.c 2008-08-03 19:54:51.000000000 +0300
+++ freeciv/common/city.c 2008-08-08 01:58:31.000000000 +0300
@@ -2156,11 +2156,10 @@
**************************************************************************/
void city_unit_upkeep(struct unit *punit, int *outputs, int *free_upkeep)
{
- struct city *pcity = game_find_city_by_number(punit->homecity);
struct unit_type *ut = unit_type(punit);
struct player *plr = unit_owner(punit);
- assert(punit != NULL && pcity != NULL && ut != NULL
+ assert(punit != NULL && ut != NULL
&& free_upkeep != NULL && outputs != NULL);
memset(outputs, 0, O_COUNT * sizeof(*outputs));
output_type_iterate(o) {
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
