Rewrite the broken code to move cargo with its carrier

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

diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c
index 2a534c0d42c6a82e76c75ea67adcd5e1673f9751..6de25f2c042560d73532ad9bcd456df0390b3e7d 100644 (file)
--- a/src/lib/subs/land.c
+++ b/src/lib/subs/land.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
@@ -33,145 +33,71 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
 #include "file.h"
 #include "land.h"
-#include "ship.h"
-#include "nsc.h"
-#include "plane.h"
-#include "prototypes.h"
+#include "lost.h"
+#include "misc.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
+#include "unit.h"
 
-int
+void
 lnd_postread(int n, void *ptr)
 {
     struct lndstr *llp = ptr;
-    struct shpstr theship;
-    struct lndstr theland;
 
     if (llp->lnd_uid != n) {
        logerror("lnd_postread: Error - %d != %d, zeroing.\n",
                 llp->lnd_uid, n);
        memset(llp, 0, sizeof(struct lndstr));
     }
-    if (llp->lnd_ship >= 0 && llp->lnd_own
-       && llp->lnd_effic >= LAND_MINEFF) {
-       if (getship(llp->lnd_ship, &theship)
-           && (theship.shp_effic >= SHIP_MINEFF)) {
-           /* wooof!  Carriers are a pain */
-           if (llp->lnd_mission) {
-               /*
-                *  If the unit is on a mission centered
-                *  on it's loc, the op-area travels with
-                *  the unit.
-                */
-               if ((llp->lnd_opx == llp->lnd_x) &&
-                   (llp->lnd_opy == llp->lnd_y)) {
-                   llp->lnd_opx = theship.shp_x;
-                   llp->lnd_opy = theship.shp_y;
-               }
-           }
-           if (llp->lnd_x != theship.shp_x || llp->lnd_y != theship.shp_y)
-               time(&llp->lnd_timestamp);
-           llp->lnd_x = theship.shp_x;
-           llp->lnd_y = theship.shp_y;
-       }
-    }
-    if (llp->lnd_land >= 0 && llp->lnd_own
-       && llp->lnd_effic >= LAND_MINEFF) {
-       if (getland(llp->lnd_land, &theland)
-           && (theland.lnd_effic >= LAND_MINEFF)) {
-           /* wooof!  Carriers are a pain */
-           if (llp->lnd_mission) {
-               /*
-                *  If the unit is on a mission centered
-                *  on it's loc, the op-area travels with
-                *  the unit.
-                */
-               if ((llp->lnd_opx == llp->lnd_x) &&
-                   (llp->lnd_opy == llp->lnd_y)) {
-                   llp->lnd_opx = theland.lnd_x;
-                   llp->lnd_opy = theland.lnd_y;
-               }
-           }
-           if (llp->lnd_x != theland.lnd_x || llp->lnd_y != theland.lnd_y)
-               time(&llp->lnd_timestamp);
-           llp->lnd_x = theland.lnd_x;
-           llp->lnd_y = theland.lnd_y;
-       }
-    }
+
     if (opt_MOB_ACCESS)
        lnd_do_upd_mob(llp);
-
     player->owner = (player->god || llp->lnd_own == player->cnum);
-    return 1;
 }
 
-int
-lnd_prewrite(int n, void *ptr)
+void
+lnd_prewrite(int n, void *old, void *new)
 {
-    struct lndstr *llp = ptr;
-    struct lndstr land;
-    struct lndstr *lp;
-    struct plnstr *pp;
-    int i;
-
-    llp->ef_type = EF_LAND;
-    llp->lnd_uid = n;
-
-    time(&llp->lnd_timestamp);
+    struct lndstr *oldlp = old;
+    struct lndstr *llp = new;
+    natid own = llp->lnd_own;
 
     if (llp->lnd_own && llp->lnd_effic < LAND_MINEFF) {
-       makelost(EF_LAND, llp->lnd_own, llp->lnd_uid, llp->lnd_x,
-                llp->lnd_y);
-       llp->lnd_own = 0;
-
-       getland(n, &land);
-
-       for (i = 0; NULL != (lp = getlandp(i)); i++) {
-           if (lp->lnd_own && lp->lnd_land == n) {
-               mpr(lp->lnd_own, "%s MIA!\n", prland(lp));
-               makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x,
-                        lp->lnd_y);
-               lp->lnd_own = 0;
-               lp->lnd_effic = 0;
-               lp->lnd_ship = -1;
-               lp->lnd_land = -1;
-               putland(lp->lnd_uid, lp);
-           }
-       }
-       for (i = 0; NULL != (pp = getplanep(i)); i++) {
-           if (pp->pln_own && pp->pln_land == n) {
-               mpr(pp->pln_own, "%s MIA!\n", prplane(pp));
-               makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x,
-                        pp->pln_y);
-               pp->pln_own = 0;
-               pp->pln_effic = 0;
-               pp->pln_ship = -1;
-               pp->pln_land = -1;
-               putplane(pp->pln_uid, pp);
-           }
-       }
+       own = 0;
+       llp->lnd_ship = llp->lnd_land = -1;
     } else {
        item_prewrite(llp->lnd_item);
-       getland(n, &land);
     }
 
-    return 1;
+    if (CANT_HAPPEN(llp->lnd_ship >= 0 && llp->lnd_land >= 0))
+       llp->lnd_land = -1;
+    if (oldlp->lnd_ship != llp->lnd_ship)
+       lnd_carrier_change(llp, EF_SHIP, oldlp->lnd_ship, llp->lnd_ship);
+    if (oldlp->lnd_land != llp->lnd_land)
+       lnd_carrier_change(llp, EF_LAND, oldlp->lnd_land, llp->lnd_land);
+
+    /* We've avoided assigning to llp->lnd_own, in case oldsp == sp */
+    if (oldlp->lnd_own != own)
+       lost_and_found(EF_LAND, oldlp->lnd_own, own,
+                      llp->lnd_uid, llp->lnd_x, llp->lnd_y);
+
+    llp->lnd_own = own;
+    if (!own || llp->lnd_x != oldlp->lnd_x || llp->lnd_y != oldlp->lnd_y)
+       unit_update_cargo((struct empobj *)llp);
 }
 
 void
-lnd_init(int n, void *ptr)
+lnd_oninit(void *ptr)
 {
     struct lndstr *lp = ptr;
 
-    lp->ef_type = EF_LAND;
-    lp->lnd_uid = n;
-    lp->lnd_own = 0;
+    lp->lnd_ship = lp->lnd_land = -1;
 }
 
-s_char *
+char *
 prland(struct lndstr *lp)
 {
     return prbuf("%s #%d", lchr[(int)lp->lnd_type].l_name, lp->lnd_uid);