Indented with src/scripts/indent-emp.
This commit is contained in:
parent
5f263a7753
commit
9b7adfbecc
437 changed files with 52211 additions and 51052 deletions
|
@ -48,61 +48,64 @@
|
|||
int
|
||||
lnd_postread(int n, s_char *ptr)
|
||||
{
|
||||
struct lndstr *llp = (struct lndstr *) ptr;
|
||||
struct shpstr theship;
|
||||
struct lndstr theland;
|
||||
|
||||
if (llp->lnd_uid != n) {
|
||||
logerror("lnd_postread: Error - %d != %d, zeroing.\n", llp->lnd_uid, n);
|
||||
bzero(ptr, sizeof(struct lndstr));
|
||||
}
|
||||
if (llp->lnd_ship >= 0 && llp->lnd_own && llp->lnd_effic >= LAND_MINEFF) {
|
||||
if (getship(llp->lnd_ship, &theship) &&
|
||||
(theship.shp_effic >= SHIP_MINEFF)) {
|
||||
/* wooof! Carriers are a pain */
|
||||
if (llp->lnd_mission){
|
||||
/*
|
||||
* If the unit is on a mission centered
|
||||
* on it's loc, the op-area travels with
|
||||
* the unit.
|
||||
*/
|
||||
if ((llp->lnd_opx == llp->lnd_x) &&
|
||||
(llp->lnd_opy == llp->lnd_y)) {
|
||||
llp->lnd_opx = theship.shp_x;
|
||||
llp->lnd_opy = theship.shp_y;
|
||||
}
|
||||
}
|
||||
if (llp->lnd_x != theship.shp_x || llp->lnd_y != theship.shp_y)
|
||||
time(&llp->lnd_timestamp);
|
||||
llp->lnd_x = theship.shp_x;
|
||||
llp->lnd_y = theship.shp_y;
|
||||
}
|
||||
struct lndstr *llp = (struct lndstr *)ptr;
|
||||
struct shpstr theship;
|
||||
struct lndstr theland;
|
||||
|
||||
if (llp->lnd_uid != n) {
|
||||
logerror("lnd_postread: Error - %d != %d, zeroing.\n",
|
||||
llp->lnd_uid, n);
|
||||
bzero(ptr, sizeof(struct lndstr));
|
||||
}
|
||||
if (llp->lnd_land >= 0 && llp->lnd_own && llp->lnd_effic >= LAND_MINEFF) {
|
||||
if (getland(llp->lnd_land, &theland) &&
|
||||
(theland.lnd_effic >= LAND_MINEFF)) {
|
||||
/* wooof! Carriers are a pain */
|
||||
if (llp->lnd_mission){
|
||||
/*
|
||||
* If the unit is on a mission centered
|
||||
* on it's loc, the op-area travels with
|
||||
* the unit.
|
||||
*/
|
||||
if ((llp->lnd_opx == llp->lnd_x) &&
|
||||
(llp->lnd_opy == llp->lnd_y)){
|
||||
llp->lnd_opx = theland.lnd_x;
|
||||
llp->lnd_opy = theland.lnd_y;
|
||||
}
|
||||
}
|
||||
if (llp->lnd_x != theland.lnd_x || llp->lnd_y != theland.lnd_y)
|
||||
time(&llp->lnd_timestamp);
|
||||
llp->lnd_x = theland.lnd_x;
|
||||
llp->lnd_y = theland.lnd_y;
|
||||
if (llp->lnd_ship >= 0 && llp->lnd_own
|
||||
&& llp->lnd_effic >= LAND_MINEFF) {
|
||||
if (getship(llp->lnd_ship, &theship)
|
||||
&& (theship.shp_effic >= SHIP_MINEFF)) {
|
||||
/* wooof! Carriers are a pain */
|
||||
if (llp->lnd_mission) {
|
||||
/*
|
||||
* If the unit is on a mission centered
|
||||
* on it's loc, the op-area travels with
|
||||
* the unit.
|
||||
*/
|
||||
if ((llp->lnd_opx == llp->lnd_x) &&
|
||||
(llp->lnd_opy == llp->lnd_y)) {
|
||||
llp->lnd_opx = theship.shp_x;
|
||||
llp->lnd_opy = theship.shp_y;
|
||||
}
|
||||
}
|
||||
if (llp->lnd_x != theship.shp_x || llp->lnd_y != theship.shp_y)
|
||||
time(&llp->lnd_timestamp);
|
||||
llp->lnd_x = theship.shp_x;
|
||||
llp->lnd_y = theship.shp_y;
|
||||
}
|
||||
}
|
||||
if (llp->lnd_land >= 0 && llp->lnd_own
|
||||
&& llp->lnd_effic >= LAND_MINEFF) {
|
||||
if (getland(llp->lnd_land, &theland)
|
||||
&& (theland.lnd_effic >= LAND_MINEFF)) {
|
||||
/* wooof! Carriers are a pain */
|
||||
if (llp->lnd_mission) {
|
||||
/*
|
||||
* If the unit is on a mission centered
|
||||
* on it's loc, the op-area travels with
|
||||
* the unit.
|
||||
*/
|
||||
if ((llp->lnd_opx == llp->lnd_x) &&
|
||||
(llp->lnd_opy == llp->lnd_y)) {
|
||||
llp->lnd_opx = theland.lnd_x;
|
||||
llp->lnd_opy = theland.lnd_y;
|
||||
}
|
||||
}
|
||||
if (llp->lnd_x != theland.lnd_x || llp->lnd_y != theland.lnd_y)
|
||||
time(&llp->lnd_timestamp);
|
||||
llp->lnd_x = theland.lnd_x;
|
||||
llp->lnd_y = theland.lnd_y;
|
||||
}
|
||||
}
|
||||
if (opt_MOB_ACCESS)
|
||||
lnd_do_upd_mob(llp);
|
||||
|
||||
lnd_do_upd_mob(llp);
|
||||
|
||||
player->owner = (player->god || llp->lnd_own == player->cnum);
|
||||
return 1;
|
||||
}
|
||||
|
@ -111,63 +114,66 @@ lnd_postread(int n, s_char *ptr)
|
|||
int
|
||||
lnd_prewrite(int n, s_char *ptr)
|
||||
{
|
||||
struct lndstr *llp = (struct lndstr *) ptr;
|
||||
struct lndstr land;
|
||||
struct lndstr *llp = (struct lndstr *)ptr;
|
||||
struct lndstr land;
|
||||
struct lndstr *lp;
|
||||
struct plnstr *pp;
|
||||
int i;
|
||||
|
||||
|
||||
llp->ef_type = EF_LAND;
|
||||
llp->lnd_uid = n;
|
||||
|
||||
|
||||
time(&llp->lnd_timestamp);
|
||||
|
||||
if (llp->lnd_own && llp->lnd_effic < LAND_MINEFF) {
|
||||
makelost(EF_LAND, llp->lnd_own, llp->lnd_uid, llp->lnd_x, llp->lnd_y);
|
||||
llp->lnd_own = 0;
|
||||
|
||||
getland(n, &land);
|
||||
|
||||
for (i = 0; NULL != (lp = getlandp(i)); i++) {
|
||||
if (lp->lnd_own && lp->lnd_land == n) {
|
||||
mpr(lp->lnd_own, "%s MIA!\n", prland(lp));
|
||||
makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
|
||||
lp->lnd_own = 0;
|
||||
lp->lnd_effic = 0;
|
||||
lp->lnd_ship = -1;
|
||||
lp->lnd_land = -1;
|
||||
putland(lp->lnd_uid, lp);
|
||||
}
|
||||
}
|
||||
for (i = 0; NULL != (pp = getplanep(i)); i++) {
|
||||
if (pp->pln_own && pp->pln_land == n) {
|
||||
mpr(pp->pln_own, "%s MIA!\n", prplane(pp));
|
||||
makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x, pp->pln_y);
|
||||
pp->pln_own = 0;
|
||||
pp->pln_effic = 0;
|
||||
pp->pln_ship = -1;
|
||||
pp->pln_land = -1;
|
||||
putplane(pp->pln_uid, pp);
|
||||
}
|
||||
}
|
||||
makelost(EF_LAND, llp->lnd_own, llp->lnd_uid, llp->lnd_x,
|
||||
llp->lnd_y);
|
||||
llp->lnd_own = 0;
|
||||
|
||||
getland(n, &land);
|
||||
|
||||
for (i = 0; NULL != (lp = getlandp(i)); i++) {
|
||||
if (lp->lnd_own && lp->lnd_land == n) {
|
||||
mpr(lp->lnd_own, "%s MIA!\n", prland(lp));
|
||||
makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x,
|
||||
lp->lnd_y);
|
||||
lp->lnd_own = 0;
|
||||
lp->lnd_effic = 0;
|
||||
lp->lnd_ship = -1;
|
||||
lp->lnd_land = -1;
|
||||
putland(lp->lnd_uid, lp);
|
||||
}
|
||||
}
|
||||
for (i = 0; NULL != (pp = getplanep(i)); i++) {
|
||||
if (pp->pln_own && pp->pln_land == n) {
|
||||
mpr(pp->pln_own, "%s MIA!\n", prplane(pp));
|
||||
makelost(EF_PLANE, pp->pln_own, pp->pln_uid, pp->pln_x,
|
||||
pp->pln_y);
|
||||
pp->pln_own = 0;
|
||||
pp->pln_effic = 0;
|
||||
pp->pln_ship = -1;
|
||||
pp->pln_land = -1;
|
||||
putplane(pp->pln_uid, pp);
|
||||
}
|
||||
}
|
||||
} else
|
||||
getland(n, &land);
|
||||
|
||||
getland(n, &land);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
void
|
||||
lnd_init(int n, s_char *ptr)
|
||||
{
|
||||
struct lndstr *lp = (struct lndstr *) ptr;
|
||||
struct lndstr *lp = (struct lndstr *)ptr;
|
||||
|
||||
lp->ef_type = EF_LAND;
|
||||
lp->lnd_uid = n;
|
||||
lp->lnd_own = 0;
|
||||
lp->ef_type = EF_LAND;
|
||||
lp->lnd_uid = n;
|
||||
lp->lnd_own = 0;
|
||||
}
|
||||
|
||||
s_char *
|
||||
prland(struct lndstr *lp)
|
||||
{
|
||||
return prbuf("%s #%d", lchr[(int)lp->lnd_type].l_name, lp->lnd_uid);
|
||||
return prbuf("%s #%d", lchr[(int)lp->lnd_type].l_name, lp->lnd_uid);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue