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

Committed S2_0 revision 13057.

Also, another wipe_unit(vunit) removed from server/citytools.c,
already removed from S2_1, but I cannot find the bug report.

Index: server/citytools.c
===================================================================
--- server/citytools.c  (revision 13056)
+++ server/citytools.c  (working copy)
@@ -619,7 +619,6 @@
       /* Don't transfer units already owned by new city-owner --wegge */ 
       if (unit_owner(vunit) == pvictim) {
        transfer_unit(vunit, pcity, verbose);
-       wipe_unit(vunit);
        unit_list_unlink(units, vunit);
       } else if (!pplayers_allied(pplayer, unit_owner(vunit))) {
         /* the owner of vunit is allied to pvictim but not to pplayer */
Index: server/unithand.c
===================================================================
--- server/unithand.c   (revision 13056)
+++ server/unithand.c   (working copy)
@@ -442,11 +442,11 @@
   /* Make the new people something, otherwise city fails the checks */
   pcity->specialists[SP_TAXMAN] += unit_pop_value(punit->type);
   auto_arrange_workers(pcity);
-  wipe_unit(punit);
-  send_city_info(NULL, pcity);
   notify_player_ex(pplayer, pcity->tile, E_NOEVENT,
                   _("Game: %s added to aid %s in growing."),
                   unit_name, pcity->name);
+  wipe_unit(punit);
+  send_city_info(NULL, pcity);
 }
 
 /**************************************************************************
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to