Fix prewrite callbacks' cargo list update for in-place update

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

diff --git a/src/lib/subs/nuke.c b/src/lib/subs/nuke.c
index 938f8bf5ffd28cc60e433c4971d765c71565d31c..ed342380686d36a5ac0b4f4dea3d308f743fd5f1 100644 (file)
--- a/src/lib/subs/nuke.c
+++ b/src/lib/subs/nuke.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,11 +25,11 @@
  *  ---
  *
  *  nuke.c: Nuke post-read and pre-write data massage
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1996
- *     Markus Armbruster, 2006-2008
+ *     Markus Armbruster, 2006-2011
  */
 
 #include <config.h>
@@ -38,38 +37,20 @@
 #include "file.h"
 #include "lost.h"
 #include "misc.h"
-#include "nat.h"
-#include "nsc.h"
 #include "nuke.h"
-#include "plane.h"
 #include "player.h"
 #include "prototypes.h"
-#include "sect.h"
-#include "xy.h"
 
 void
 nuk_postread(int n, void *ptr)
 {
     struct nukstr *np = ptr;
-    struct plnstr plane;
 
     if (np->nuk_uid != n) {
        logerror("nuk_postread: Error - %d != %d, zeroing.\n",
                 np->nuk_uid, n);
        memset(np, 0, sizeof(struct nukstr));
     }
-
-    if (np->nuk_plane >= 0 && np->nuk_own && np->nuk_effic >= 0) {
-       if (getplane(np->nuk_plane, &plane)
-           && plane.pln_effic >= PLANE_MINEFF) {
-           if (np->nuk_x != plane.pln_x || np->nuk_y != plane.pln_y) {
-               time(&np->nuk_timestamp);
-               np->nuk_x = plane.pln_x;
-               np->nuk_y = plane.pln_y;
-           }
-       }
-    }
-
     player->owner = (player->god || np->nuk_own == player->cnum);
 }
 
@@ -78,37 +59,25 @@ nuk_prewrite(int n, void *old, void *new)
 {
     struct nukstr *oldnp = old;
     struct nukstr *np = new;
-    natid own = np->nuk_own;
+    natid own = np->nuk_effic == 0 ? 0 : np->nuk_own;
+    int plane = np->nuk_plane;
 
-    if (np->nuk_effic == 0)
-       own = 0;
+    /* Be careful with writing to *np, in case oldnp == np */
 
-    /* We've avoided assigning to np->nuk_own, in case oldsp == sp */
-    if (oldnp->nuk_own != own) {
-       if (oldnp->nuk_own)
-           makelost(EF_NUKE, oldnp->nuk_own,
-                    np->nuk_uid, np->nuk_x, np->nuk_y);
-       if (own)
-           makenotlost(EF_NUKE, own,
-                       np->nuk_uid, np->nuk_x, np->nuk_y);
+    if (!own) {
+       np->nuk_effic = 0;
+       plane = -1;
     }
 
-    np->nuk_own = own;
-}
+    if (oldnp->nuk_plane != plane)
+       nuk_carrier_change(np, EF_PLANE, oldnp->nuk_plane, plane);
 
-int
-nuk_on_plane(struct nukstr *np, int pluid)
-{
-    struct nstr_item ni;
+    if (oldnp->nuk_own != own)
+       lost_and_found(EF_NUKE, oldnp->nuk_own, own,
+                      np->nuk_uid, np->nuk_x, np->nuk_y);
 
-    snxtitem_all(&ni, EF_NUKE);
-    while (nxtitem(&ni, np)) {
-       if (np->nuk_own == 0)
-           continue;
-       if (np->nuk_plane == pluid)
-           return np->nuk_uid;
-    }
-    return -1;
+    np->nuk_own = own;
+    np->nuk_plane = plane;
 }
 
 char *