/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, 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:
* Dave Pare, 1989
* Steve McClure, 1996
- * Markus Armbruster, 2006-2008
+ * Markus Armbruster, 2006-2011
*/
#include <config.h>
struct plnstr *oldpp = old;
struct plnstr *pp = new;
natid own = pp->pln_effic < PLANE_MINEFF ? 0 : pp->pln_own;
+ int ship = pp->pln_ship;
+ int land = pp->pln_land;
+
+ /* Be careful with writing to *pp, in case oldpp == pp */
if (!own) {
pp->pln_effic = 0;
- pp->pln_ship = pp->pln_land = -1;
+ ship = land = -1;
}
- if (CANT_HAPPEN(pp->pln_ship >= 0 && pp->pln_land >= 0))
- pp->pln_land = -1;
- if (oldpp->pln_ship != pp->pln_ship)
- pln_carrier_change(pp, EF_SHIP, oldpp->pln_ship, pp->pln_ship);
- if (oldpp->pln_land != pp->pln_land)
- pln_carrier_change(pp, EF_LAND, oldpp->pln_land, pp->pln_land);
+ if (CANT_HAPPEN(ship >= 0 && land >= 0))
+ land = -1;
+ if (oldpp->pln_ship != ship)
+ pln_carrier_change(pp, EF_SHIP, oldpp->pln_ship, ship);
+ if (oldpp->pln_land != land)
+ pln_carrier_change(pp, EF_LAND, oldpp->pln_land, land);
- /* We've avoided assigning to pp->pln_own, in case oldpp == pp */
- if (oldpp->pln_own != own)
+ if (oldpp->pln_own != own) {
lost_and_found(EF_PLANE, oldpp->pln_own, own,
pp->pln_uid, pp->pln_x, pp->pln_y);
+ CANT_HAPPEN(!oldpp->pln_own
+ && unit_update_cargo((struct empobj *)oldpp));
+ }
pp->pln_own = own;
+ pp->pln_ship = ship;
+ pp->pln_land = land;
if (!own || pp->pln_x != oldpp->pln_x || pp->pln_y != oldpp->pln_y)
unit_update_cargo((struct empobj *)pp);
}
-void
-pln_oninit(void *ptr)
-{
- struct plnstr *pp = ptr;
-
- pp->pln_ship = pp->pln_land = -1;
-}
-
char *
prplane(struct plnstr *pp)
{