/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* 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 *