Update copyright notice

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

diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c
index 3811374eafd52ec52b70ed3feb7d475d70e04568..6306aadd3b53909c3d7a4e75c7037beb61083356 100644 (file)
--- a/src/lib/subs/ship.c
+++ b/src/lib/subs/ship.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-2018, 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,16 +25,15 @@
  *  ---
  *
  *  ship.c: Ship pre-write data massage
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1996
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
 
-#include "file.h"
 #include "lost.h"
 #include "misc.h"
 #include "optlist.h"
@@ -43,6 +41,7 @@
 #include "prototypes.h"
 #include "ship.h"
 #include "unit.h"
+#include "update.h"
 
 void
 shp_postread(int n, void *ptr)
@@ -55,9 +54,10 @@ shp_postread(int n, void *ptr)
        memset(sp, 0, sizeof(struct shpstr));
     }
 
-    if (opt_MOB_ACCESS)
-       shp_do_upd_mob(sp);
     player->owner = (player->god || sp->shp_own == player->cnum);
+
+    if (opt_MOB_ACCESS & sp->shp_own && !update_running)
+       mob_inc_ship(sp, game_tick_to_now(&sp->shp_access));
 }
 
 void
@@ -70,14 +70,17 @@ shp_prewrite(int n, void *old, void *new)
     if (!own) {
        sp->shp_effic = 0;
        if (sp->shp_own)
-           mpr(own, "\t%s sunk!\n", prship(sp));
+           mpr(sp->shp_own, "\t%s sunk!\n", prship(sp));
     }
     item_prewrite(sp->shp_item);
 
     /* We've avoided assigning to sp->shp_own, in case oldsp == sp */
-    if (oldsp->shp_own != own)
+    if (oldsp->shp_own != own) {
        lost_and_found(EF_SHIP, oldsp->shp_own, own,
                       sp->shp_uid, sp->shp_x, sp->shp_y);
+       CANT_HAPPEN(!oldsp->shp_own
+                   && unit_update_cargo((struct empobj *)oldsp));
+    }
 
     sp->shp_own = own;
     if (!own || sp->shp_x != oldsp->shp_x || sp->shp_y != oldsp->shp_y)