empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove pointless getFOO() from prewrite callbacks

Browse source 
Empire3's C_SYNC code added these to sct_prewrite(), shp_prewrite(),
pln_prewrite(), lnd_prewrite() and nuk_prewrite().  They weren't
removed when C_SYNC was ripped out in 4.0.0.
This commit is contained in:
Markus Armbruster 2008-09-02 19:12:06 -04:00
parent afcde86ca3
commit d87801acaa
5 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/subs/land.c
View file

@ -112,7 +112,6 @@ void
lnd_prewrite(int n, void *ptr) lnd_prewrite(int n, void *ptr)
{ {
struct lndstr *llp = ptr; struct lndstr *llp = ptr;
struct lndstr land;
struct lndstr *lp; struct lndstr *lp;
struct plnstr *pp; struct plnstr *pp;
int i; int i;
@ -122,8 +121,6 @@ lnd_prewrite(int n, void *ptr)
llp->lnd_x, llp->lnd_y); llp->lnd_x, llp->lnd_y);
llp->lnd_own = 0; llp->lnd_own = 0;
getland(n, &land);
for (i = 0; NULL != (lp = getlandp(i)); i++) { for (i = 0; NULL != (lp = getlandp(i)); i++) {
if (lp->lnd_own && lp->lnd_land == n) { if (lp->lnd_own && lp->lnd_land == n) {
mpr(lp->lnd_own, "%s MIA!\n", prland(lp)); mpr(lp->lnd_own, "%s MIA!\n", prland(lp));
@ -150,7 +147,6 @@ lnd_prewrite(int n, void *ptr)
} }
} else { } else {
item_prewrite(llp->lnd_item); item_prewrite(llp->lnd_item);
getland(n, &land);
} }
} }

3
src/lib/subs/nuke.c
View file

@ -77,7 +77,6 @@ void
nuk_prewrite(int n, void *ptr) nuk_prewrite(int n, void *ptr)
{ {
struct nukstr *np = ptr; struct nukstr *np = ptr;
struct nukstr nuke;
if (np->nuk_effic == 0) { if (np->nuk_effic == 0) {
if (np->nuk_own) if (np->nuk_own)
@ -86,8 +85,6 @@ nuk_prewrite(int n, void *ptr)
np->nuk_own = 0; np->nuk_own = 0;
np->nuk_effic = 0; np->nuk_effic = 0;
} }
getnuke(n, &nuke);
} }
int int

2
src/lib/subs/plane.c
View file

@ -111,7 +111,6 @@ void
pln_prewrite(int n, void *ptr) pln_prewrite(int n, void *ptr)
{ {
struct plnstr *pp = ptr; struct plnstr *pp = ptr;
struct plnstr plane;
struct nukstr *np; struct nukstr *np;
int i; int i;
@ -130,7 +129,6 @@ pln_prewrite(int n, void *ptr)
} }
} }
} }
getplane(n, &plane);
} }
char * char *

2
src/lib/subs/sect.c
View file

@ -65,11 +65,9 @@ void
sct_prewrite(int id, void *ptr) sct_prewrite(int id, void *ptr)
{ {
struct sctstr *sp = ptr; struct sctstr *sp = ptr;
struct sctstr sect;
bridge_damaged(sp); bridge_damaged(sp);
checksect(sp); checksect(sp);
getsect(sp->sct_x, sp->sct_y, &sect);
} }
void void

4
src/lib/subs/ship.c
View file

@ -65,7 +65,6 @@ void
shp_prewrite(int n, void *ptr) shp_prewrite(int n, void *ptr)
{ {
struct shpstr *sp = ptr; struct shpstr *sp = ptr;
struct shpstr ship;
struct lndstr *lp; struct lndstr *lp;
struct plnstr *pp; struct plnstr *pp;
int i; int i;
@ -75,8 +74,6 @@ shp_prewrite(int n, void *ptr)
makelost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x, sp->shp_y); makelost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x, sp->shp_y);
sp->shp_own = 0; sp->shp_own = 0;
getship(n, &ship);
for (i = 0; NULL != (lp = getlandp(i)); i++) { for (i = 0; NULL != (lp = getlandp(i)); i++) {
if (lp->lnd_own && lp->lnd_ship == n) { if (lp->lnd_own && lp->lnd_ship == n) {
mpr(lp->lnd_own, "%s sunk!\n", prland(lp)); mpr(lp->lnd_own, "%s sunk!\n", prland(lp));
@ -97,7 +94,6 @@ shp_prewrite(int n, void *ptr)
} }
} else { } else {
item_prewrite(sp->shp_item); item_prewrite(sp->shp_item);
getship(n, &ship);
} }
} }