/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* unitsub.c: Common subroutines for multiple type of units
- *
+ *
* Known contributors to this file:
* Ron Koenderink, 2007
- * Markus Armbruster, 2008
+ * Markus Armbruster, 2009
*/
#include <config.h>
return;
qp = unit_list->q_back;
ulp = (struct ulist *)qp;
- type = ulp->unit.ef_type;
+ type = ulp->unit.gen.ef_type;
if (CANT_HAPPEN(type != EF_LAND && type != EF_SHIP))
return;
return NULL;
if (!sarg_xy(buf, &destx, &desty))
- return 0;
+ return NULL;
if (!together) {
pr("Cannot go to a destination sector if not all starting in the same sector\n");
- return 0;
+ return NULL;
}
if (!getsect(destx, desty, &d_sect)) {
pr("%d,%d is not a sector\n", destx, desty);
- return 0;
+ return NULL;
}
if (unit->ef_type == EF_SHIP) {
cp = BestShipPath(buf, unit->x, unit->y,
if (!cp || unit->mobil <= 0) {
pr("Can't get to '%s' right now.\n",
xyas(d_sect.sct_x, d_sect.sct_y, player->cnum));
- return 0;
+ return NULL;
}
} else {
getsect(unit->x, unit->y, §);
mtype == MOB_RAIL ? "railway" : "path",
xyas(unit->x, unit->y, player->cnum),
xyas(d_sect.sct_x, d_sect.sct_y, player->cnum));
- return 0;
+ return NULL;
}
pr("Using path '%s'\n", cp);
}
for (qp = list->q_back; qp != list; qp = next) {
next = qp->q_back;
ulp = (struct ulist *)qp;
- if (CANT_HAPPEN(!(ef_flags(ulp->unit.ef_type) & EFF_XY)))
+ if (CANT_HAPPEN(!(ef_flags(ulp->unit.gen.ef_type) & EFF_XY)))
continue;
getsect(ulp->unit.gen.x, ulp->unit.gen.y, §);
- if (ulp->unit.ef_type == EF_SHIP) {
+ if (ulp->unit.gen.ef_type == EF_SHIP) {
if (((struct mchrstr *)ulp->chrp)->m_flags & M_FOOD)
pr("[fert:%d] ", sect.sct_fertil);
if (((struct mchrstr *)ulp->chrp)->m_flags & M_OIL)
unit->own = recipient;
unit_wipe_orders(unit);
+ put_empobj(unit->ef_type, unit->uid, unit);
for (type = EF_PLANE; type <= EF_NUKE; type++) {
snxtitem_cargo(&ni, type, unit->ef_type, unit->uid);
- while (nxtitem(&ni, &cargo)) {
+ while (nxtitem(&ni, &cargo))
unit_give_away(&cargo.gen, recipient, giver);
- put_empobj(type, cargo.gen.uid, &cargo.gen);
- }
}
}
lp->lnd_retreat = morale_base;
lp->lnd_rflags = 0;
lp->lnd_rpath[0] = 0;
- lp->lnd_rad_max = 0;
break;
case EF_NUKE:
break;