Rewrite the broken code to move cargo with its carrier

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

diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c
index 3c21b26a3811e87bf15218135af6cd9a6270730b..39e0ee8013c29e5be42662bf31c20bab3a41e125 100644 (file)
--- a/src/lib/subs/plane.c
+++ b/src/lib/subs/plane.c
@@ -35,73 +35,24 @@
 #include <config.h>
 
 #include "file.h"
-#include "land.h"
 #include "lost.h"
 #include "misc.h"
-#include "nuke.h"
 #include "optlist.h"
 #include "plane.h"
 #include "player.h"
 #include "prototypes.h"
-#include "ship.h"
+#include "unit.h"
 
 void
 pln_postread(int n, void *ptr)
 {
     struct plnstr *pp = ptr;
-    struct shpstr theship;
-    struct lndstr theland;
 
     if (pp->pln_uid != n) {
        logerror("pln_postread: Error - %d != %d, zeroing.\n",
                 pp->pln_uid, n);
        memset(pp, 0, sizeof(struct plnstr));
     }
-
-    if (pp->pln_ship >= 0 && pp->pln_own && pp->pln_effic >= PLANE_MINEFF) {
-       if (getship(pp->pln_ship, &theship) &&
-           (theship.shp_effic >= SHIP_MINEFF)) {
-           /* wooof!  Carriers are a pain */
-           if (pp->pln_mission) {
-               /*
-                *  If the plane is on a mission centered
-                *  on it's loc, the op-area travels with
-                *  the plane.
-                */
-               if ((pp->pln_opx == pp->pln_x) &&
-                   (pp->pln_opy == pp->pln_y)) {
-                   pp->pln_opx = theship.shp_x;
-                   pp->pln_opy = theship.shp_y;
-               }
-           }
-           if (pp->pln_x != theship.shp_x || pp->pln_y != theship.shp_y)
-               time(&pp->pln_timestamp);
-           pp->pln_x = theship.shp_x;
-           pp->pln_y = theship.shp_y;
-       }
-    }
-    if (pp->pln_land >= 0 && pp->pln_own && pp->pln_effic >= PLANE_MINEFF) {
-       if (getland(pp->pln_land, &theland) &&
-           (theland.lnd_effic >= LAND_MINEFF)) {
-           /* wooof!  Units are a pain, too */
-           if (pp->pln_mission) {
-               /*
-                *  If the plane is on a mission centered
-                *  on it's loc, the op-area travels with
-                *  the plane.
-                */
-               if ((pp->pln_opx == pp->pln_x) &&
-                   (pp->pln_opy == pp->pln_y)) {
-                   pp->pln_opx = theland.lnd_x;
-                   pp->pln_opy = theland.lnd_y;
-               }
-           }
-           if (pp->pln_x != theland.lnd_x || pp->pln_y != theland.lnd_y)
-               time(&pp->pln_timestamp);
-           pp->pln_x = theland.lnd_x;
-           pp->pln_y = theland.lnd_y;
-       }
-    }
     player->owner = (player->god || pp->pln_own == player->cnum);
     if (opt_MOB_ACCESS)
        pln_do_upd_mob(pp);
@@ -110,25 +61,39 @@ pln_postread(int n, void *ptr)
 void
 pln_prewrite(int n, void *old, void *new)
 {
+    struct plnstr *oldpp = old;
     struct plnstr *pp = new;
-    struct nukstr *np;
-    int i;
+    natid own = pp->pln_own;
 
     if (pp->pln_effic < PLANE_MINEFF) {
-       if (pp->pln_own)
-           makelost(EF_PLANE, pp->pln_own, pp->pln_uid,
-                    pp->pln_x, pp->pln_y);
-       pp->pln_own = 0;
+       own = 0;
        pp->pln_effic = 0;
-       for (i = 0; NULL != (np = getnukep(i)); i++) {
-           if (np->nuk_own && np->nuk_plane == n) {
-               mpr(np->nuk_own, "%s lost!\n", prnuke(np));
-               np->nuk_effic = 0;
-               np->nuk_plane = -1;
-               putnuke(np->nuk_uid, np);
-           }
-       }
+       pp->pln_ship = pp->pln_land = -1;
     }
+
+    if (CANT_HAPPEN(pp->pln_ship >= 0 && pp->pln_land >= 0))
+       pp->pln_land = -1;
+    if (oldpp->pln_ship != pp->pln_ship)
+       pln_carrier_change(pp, EF_SHIP, oldpp->pln_ship, pp->pln_ship);
+    if (oldpp->pln_land != pp->pln_land)
+       pln_carrier_change(pp, EF_LAND, oldpp->pln_land, pp->pln_land);
+
+    /* We've avoided assigning to pp->pln_own, in case oldsp == sp */
+    if (oldpp->pln_own != own)
+       lost_and_found(EF_PLANE, oldpp->pln_own, own,
+                      pp->pln_uid, pp->pln_x, pp->pln_y);
+
+    pp->pln_own = own;
+    if (!own || pp->pln_x != oldpp->pln_x || pp->pln_y != oldpp->pln_y)
+       unit_update_cargo((struct empobj *)pp);
+}
+
+void
+pln_oninit(void *ptr)
+{
+    struct plnstr *pp = ptr;
+
+    pp->pln_ship = pp->pln_land = -1;
 }
 
 char *