/*
* 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-2014, 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,
* 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/>.
*
* ---
*
*
* Known contributors to this file:
* Steve McClure, 1996
- * Markus Armbruster, 2004-2008
+ * Markus Armbruster, 2004-2011
*/
#include <config.h>
struct lndstr *oldlp = old;
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 (!own) {
lp->lnd_effic = 0;
- lp->lnd_ship = lp->lnd_land = -1;
+ ship = land = -1;
}
item_prewrite(lp->lnd_item);
- if (CANT_HAPPEN(lp->lnd_ship >= 0 && lp->lnd_land >= 0))
- lp->lnd_land = -1;
- if (oldlp->lnd_ship != lp->lnd_ship)
- lnd_carrier_change(lp, EF_SHIP, oldlp->lnd_ship, lp->lnd_ship);
- if (oldlp->lnd_land != lp->lnd_land)
- lnd_carrier_change(lp, EF_LAND, oldlp->lnd_land, lp->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 lp->lnd_own, in case oldlp == lp */
- if (oldlp->lnd_own != own)
+ if (oldlp->lnd_own != own) {
lost_and_found(EF_LAND, oldlp->lnd_own, own,
lp->lnd_uid, lp->lnd_x, lp->lnd_y);
+ CANT_HAPPEN(!oldlp->lnd_own
+ && unit_update_cargo((struct empobj *)oldlp));
+ }
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);
}
-void
-lnd_oninit(void *ptr)
-{
- struct lndstr *lp = ptr;
-
- lp->lnd_ship = lp->lnd_land = -1;
-}
-
char *
prland(struct lndstr *lp)
{