Update copyright notice

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

diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c
index 6de25f2c042560d73532ad9bcd456df0390b3e7d..44b7c1d21326ea032292c2b38c0f86d5515fa30f 100644 (file)
--- a/src/lib/subs/land.c
+++ b/src/lib/subs/land.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-2013, 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,9 +25,10 @@
  *  ---
  *
  *  land.c: Land unit post-read and pre-write
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1996
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
@@ -45,56 +45,55 @@
 void
 lnd_postread(int n, void *ptr)
 {
-    struct lndstr *llp = ptr;
+    struct lndstr *lp = ptr;
 
-    if (llp->lnd_uid != n) {
+    if (lp->lnd_uid != n) {
        logerror("lnd_postread: Error - %d != %d, zeroing.\n",
-                llp->lnd_uid, n);
-       memset(llp, 0, sizeof(struct lndstr));
+                lp->lnd_uid, n);
+       memset(lp, 0, sizeof(struct lndstr));
     }
 
     if (opt_MOB_ACCESS)
-       lnd_do_upd_mob(llp);
-    player->owner = (player->god || llp->lnd_own == player->cnum);
+       lnd_do_upd_mob(lp);
+    player->owner = (player->god || lp->lnd_own == player->cnum);
 }
 
 void
 lnd_prewrite(int n, void *old, void *new)
 {
     struct lndstr *oldlp = old;
-    struct lndstr *llp = new;
-    natid own = llp->lnd_own;
+    struct lndstr *lp = new;
+    natid own = lp->lnd_effic < LAND_MINEFF ? 0 : lp->lnd_own;
+    int ship = lp->lnd_ship;
+    int land = lp->lnd_land;
+
+    /* Be careful with writing to *lp, in case oldlp == lp */
 
-    if (llp->lnd_own && llp->lnd_effic < LAND_MINEFF) {
-       own = 0;
-       llp->lnd_ship = llp->lnd_land = -1;
-    } else {
-       item_prewrite(llp->lnd_item);
+    if (!own) {
+       lp->lnd_effic = 0;
+       ship = land = -1;
     }
+    item_prewrite(lp->lnd_item);
 
-    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);
+    if (CANT_HAPPEN(ship >= 0 && land >= 0))
+       land = -1;
+    if (oldlp->lnd_ship != ship)
+       lnd_carrier_change(lp, EF_SHIP, oldlp->lnd_ship, ship);
+    if (oldlp->lnd_land != land)
+       lnd_carrier_change(lp, EF_LAND, oldlp->lnd_land, land);
 
-    /* We've avoided assigning to llp->lnd_own, in case oldsp == sp */
-    if (oldlp->lnd_own != own)
+    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_oninit(void *ptr)
-{
-    struct lndstr *lp = ptr;
+                      lp->lnd_uid, lp->lnd_x, lp->lnd_y);
+       CANT_HAPPEN(!oldlp->lnd_own
+                   && unit_update_cargo((struct empobj *)oldlp));
+    }
 
-    lp->lnd_ship = lp->lnd_land = -1;
+    lp->lnd_own = own;
+    lp->lnd_ship = ship;
+    lp->lnd_land = land;
+    if (!own || lp->lnd_x != oldlp->lnd_x || lp->lnd_y != oldlp->lnd_y)
+       unit_update_cargo((struct empobj *)lp);
 }
 
 char *