/*
* 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-2011, 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 nukstr *oldnp = old;
struct nukstr *np = new;
natid own = np->nuk_effic == 0 ? 0 : np->nuk_own;
+ int plane = np->nuk_plane;
+
+ /* Be careful with writing to *np, in case oldnp == np */
if (!own) {
np->nuk_effic = 0;
- np->nuk_plane = -1;
+ plane = -1;
}
- if (oldnp->nuk_plane != np->nuk_plane)
- nuk_carrier_change(np, EF_PLANE, oldnp->nuk_plane, np->nuk_plane);
+ if (oldnp->nuk_plane != plane)
+ nuk_carrier_change(np, EF_PLANE, oldnp->nuk_plane, plane);
- /* We've avoided assigning to np->nuk_own, in case oldnp == np */
if (oldnp->nuk_own != own)
lost_and_found(EF_NUKE, oldnp->nuk_own, own,
np->nuk_uid, np->nuk_x, np->nuk_y);
np->nuk_own = own;
-}
-
-void
-nuk_oninit(void *ptr)
-{
- struct nukstr *np = ptr;
-
- np->nuk_plane = -1;
+ np->nuk_plane = plane;
}
char *