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 b45ddaf369a0cbdf3e41e4159b74e83fe81f5c89..39e0ee8013c29e5be42662bf31c20bab3a41e125 100644 (file)
--- a/src/lib/subs/plane.c
+++ b/src/lib/subs/plane.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -34,112 +34,69 @@
 
 #include <config.h>
 
+#include "file.h"
+#include "lost.h"
 #include "misc.h"
-#include "player.h"
+#include "optlist.h"
 #include "plane.h"
-#include "ship.h"
-#include "land.h"
-#include "file.h"
+#include "player.h"
 #include "prototypes.h"
-#include "optlist.h"
+#include "unit.h"
 
-int
+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);
+       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);
-    return 1;
 }
 
-int
-pln_prewrite(int n, void *ptr)
+void
+pln_prewrite(int n, void *old, void *new)
 {
-    struct plnstr *pp = ptr;
-    struct plnstr plane;
+    struct plnstr *oldpp = old;
+    struct plnstr *pp = new;
+    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;
+       pp->pln_ship = pp->pln_land = -1;
     }
-    pp->ef_type = EF_PLANE;
-    pp->pln_uid = n;
 
-    time(&pp->pln_timestamp);
+    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);
 
-    getplane(n, &plane);
+    /* 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);
 
-    return 1;
+    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_init(int n, void *ptr)
+pln_oninit(void *ptr)
 {
     struct plnstr *pp = ptr;
 
-    pp->ef_type = EF_PLANE;
-    pp->pln_uid = n;
-    pp->pln_own = 0;
+    pp->pln_ship = pp->pln_land = -1;
 }
 
-s_char *
+char *
 prplane(struct plnstr *pp)
 {
     return prbuf("%s #%d", plchr[(int)pp->pln_type].pl_name, pp->pln_uid);