Oops when stuck cargo snaps to new ship, plane or land unit

[empserver] / src / lib / subs / ship.c

diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c
index 119648ca67aa22a9a415c5ed06afda78a14df273..dadee5fca383bfe9e0d157e73805eef9ae403fde 100644 (file)
--- a/src/lib/subs/ship.c
+++ b/src/lib/subs/ship.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1996
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
@@ -74,9 +74,12 @@ shp_prewrite(int n, void *old, void *new)
     item_prewrite(sp->shp_item);
 
     /* We've avoided assigning to sp->shp_own, in case oldsp == sp */
-    if (oldsp->shp_own != own)
+    if (oldsp->shp_own != own) {
        lost_and_found(EF_SHIP, oldsp->shp_own, own,
                       sp->shp_uid, sp->shp_x, sp->shp_y);
+       CANT_HAPPEN(!oldsp->shp_own
+                   && unit_update_cargo((struct empobj *)oldsp));
+    }
 
     sp->shp_own = own;
     if (!own || sp->shp_x != oldsp->shp_x || sp->shp_y != oldsp->shp_y)