Markus Armbruster
3cf29456fe
The old code did not move a carrier's cargo (planes, land units, nukes) when the carrier moved. Instead, it fixed up the location in the postread callback. Anything not going through ef_read(), in particular the update, saw it in its old, incorrect location, until a fixed up copy got written back. Moreover, the timestamp did not change when cargo moved, so incremental dumps did not pick up the movement. The new code moves the cargo along with the carrier. New unit_update_cargo() moves or destroys a carrier's cargo (planes, land units, nukes) along with the carrier. Call it from shp_prewrite(), pln_prewrite() and lnd_prewrite() when the carrier moves or gets destroyed. Remove the code to destroy cargo from shp_prewrite(), pln_prewrite(), lnd_prewrite(). Remove the code to fix up cargo location from pln_postread(), lnd_postread(), nuk_postread(). This changes the message for ship and land unit cargo getting destroyed from "sunk" and "MIA" to "lost".
59 lines
2.2 KiB
C
59 lines
2.2 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure
|
|
*
|
|
* This program 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
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* 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
|
|
*
|
|
* ---
|
|
*
|
|
* See files README, COPYING and CREDITS in the root of the source
|
|
* tree for related information and legal notices. It is expected
|
|
* that future projects/authors will amend these files as needed.
|
|
*
|
|
* ---
|
|
*
|
|
* unit.h: Generalize unit data structures and functions.
|
|
*
|
|
* Known contributors to this file:
|
|
* Ron Koenderink, 2006-2007
|
|
* Markus Armbruster, 2006
|
|
*/
|
|
|
|
#include "empobj.h"
|
|
|
|
struct ulist {
|
|
struct emp_qelem queue; /* list of units */
|
|
double mobil; /* how much mobility the unit has left */
|
|
struct empobj_chr *chrp; /* pointer to characteristics unit */
|
|
union empobj_storage unit; /* unit */
|
|
coord x, y; /* x,y it came from LAND only */
|
|
int eff; /* LAND only */
|
|
int supplied; /* LAND only */
|
|
};
|
|
|
|
extern void unit_cargo_init(void);
|
|
extern void unit_carrier_change(struct empobj *, int, int, int);
|
|
extern int unit_cargo_first(int, int, int);
|
|
extern int unit_cargo_next(int, int);
|
|
extern int unit_cargo_count(int, int, int);
|
|
extern int unit_nplane(int, int, int *, int *, int *);
|
|
extern int unit_onresize(int);
|
|
|
|
extern void unit_list(struct emp_qelem *);
|
|
extern void unit_put(struct emp_qelem *list, natid actor);
|
|
extern char *unit_path(int, struct empobj *, char *);
|
|
extern void unit_view(struct emp_qelem *);
|
|
extern void unit_update_cargo(struct empobj *);
|