Update copyright notice

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

diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c
index bbd77420edc130c1bd9b83e1de25e30ccf096792..43a0a200b6dff3b9dff1505e990f371f02bbd822 100644 (file)
--- a/src/lib/subs/ship.c
+++ b/src/lib/subs/ship.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,121 +19,75 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  ship.c: Ship pre-write data massage
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2004-2008
  */
 
+#include <config.h>
+
+#include "file.h"
+#include "lost.h"
 #include "misc.h"
+#include "optlist.h"
 #include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "file.h"
-#include "nat.h"
-#include "ship.h"
-#include "deity.h"
-#include "land.h"
-#include "plane.h"
-#include "nsc.h"
 #include "prototypes.h"
-#include "optlist.h"
+#include "ship.h"
+#include "unit.h"
 
-/*ARGSUSED*/
-int
-shp_postread(int n, s_char *ptr)
+void
+shp_postread(int n, void *ptr)
 {
-    struct shpstr *sp = (struct shpstr *)ptr;
+    struct shpstr *sp = ptr;
 
     if (sp->shp_uid != n) {
-       logerror("shp_postread: Error - %d != %d, zeroing.\n", sp->shp_uid,
-                n);
+       logerror("shp_postread: Error - %d != %d, zeroing.\n",
+                sp->shp_uid, n);
        memset(sp, 0, sizeof(struct shpstr));
     }
 
     if (opt_MOB_ACCESS)
        shp_do_upd_mob(sp);
     player->owner = (player->god || sp->shp_own == player->cnum);
-    return 1;
 }
 
-int
-shp_prewrite(int n, s_char *ptr)
+void
+shp_prewrite(int n, void *old, void *new)
 {
-    struct shpstr *sp = (struct shpstr *)ptr;
-    struct shpstr ship;
-    struct lndstr *lp;
-    struct plnstr *pp;
-    int i;
+    struct shpstr *oldsp = old;
+    struct shpstr *sp = new;
+    natid own = sp->shp_effic < SHIP_MINEFF ? 0 : sp->shp_own;
 
-    sp->ef_type = EF_SHIP;
-    sp->shp_uid = n;
-
-    time(&sp->shp_timestamp);
-
-    if (sp->shp_own != 0 && sp->shp_effic < SHIP_MINEFF) {
-       mpr(sp->shp_own, "\t%s sunk!\n", prship(sp));
-       makelost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x, sp->shp_y);
-       sp->shp_own = 0;
-
-       getship(n, &ship);
-
-       for (i = 0; NULL != (lp = getlandp(i)); i++) {
-           if (lp->lnd_own && lp->lnd_ship == n) {
-               mpr(lp->lnd_own, "%s sunk!\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_ship == n) {
-               mpr(pp->pln_own, "%s sunk!\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);
-           }
-       }
-    } else
-       getship(n, &ship);
-
-    return 1;
-}
+    if (!own) {
+       sp->shp_effic = 0;
+       if (sp->shp_own)
+           mpr(sp->shp_own, "\t%s sunk!\n", prship(sp));
+    }
+    item_prewrite(sp->shp_item);
 
-void
-shp_init(int n, s_char *ptr)
-{
-    struct shpstr *sp = (struct shpstr *)ptr;
+    /* We've avoided assigning to sp->shp_own, in case oldsp == sp */
+    if (oldsp->shp_own != own)
+       lost_and_found(EF_SHIP, oldsp->shp_own, own,
+                      sp->shp_uid, sp->shp_x, sp->shp_y);
 
-    sp->ef_type = EF_SHIP;
-    sp->shp_uid = n;
-    sp->shp_own = 0;
+    sp->shp_own = own;
+    if (!own || sp->shp_x != oldsp->shp_x || sp->shp_y != oldsp->shp_y)
+       unit_update_cargo((struct empobj *)sp);
 }
 
-s_char *
+char *
 prship(struct shpstr *sp)
 {
-    if (opt_SHIPNAMES) {
-       return prbuf("%s %s(#%d)",
-                    mchr[(int)sp->shp_type].m_name, sp->shp_name,
-                    sp->shp_uid);
-    } else {
-       return prbuf("%s #%d", mchr[(int)sp->shp_type].m_name,
-                    sp->shp_uid);
-    }
+    return prbuf("%s %s(#%d)",
+                mchr[(int)sp->shp_type].m_name, sp->shp_name,
+                sp->shp_uid);
 }