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

Indentation fixes; suspect indent-emp is to blame.

Browse source
This commit is contained in:
Markus Armbruster 2004-02-28 18:06:11 +00:00
parent aa4e268d89
commit e67dca9d29
29 changed files with 89 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/as/as_cache.c
View file

@ -107,9 +107,7 @@ as_add_cachepath(struct as_data *adp)
/* And set some stuff */
from->x = adp->from.x;
/* Here we malloc a whole bunch of tolist pointers. */
from->tolist = (struct as_topath **)calloc(1,
sizeof(struct as_topath
*) * WORLD_Y);
from->tolist = calloc(1, sizeof(struct as_topath *) * WORLD_Y);
/* Now, add from to the global list */
from->next = fromhead[adp->from.y];
fromhead[adp->from.y] = from;

15
src/lib/commands/bomb.c
View file

@ -110,8 +110,8 @@ bomb(void)
wantflags = 0;
if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
return RET_SYN;
if (!snxtitem
(&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
if (!snxtitem(&ni_esc, EF_PLANE,
getstarg(player->argp[2], "escort(s)? ", buf)))
pr("No escorts...\n");
if ((p =
getstarg(player->argp[3], "pinpoint, or strategic? ", buf)) == 0)
@ -255,9 +255,8 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0);
getvec(VT_ITEM, vec, (s_char *)target, EF_SECTOR);
retry:
p = getstring
("Bomb what? (ship, plane, land unit, efficiency, commodities) ",
buf);
p = getstring("Bomb what? (ship, plane, land unit, efficiency, commodities) ",
buf);
if (p == 0 || *p == 0) {
if (player->aborted)
return;
@ -598,8 +597,7 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
sprintf(msg, "Flak! Firing %d guns from ship %s\n",
flak, prship(&ship));
PR(ship.shp_own, msg);
if (pinflak_planedamage
(&plp->plane, plp->pcp, ship.shp_own, flak))
if (pinflak_planedamage(&plp->plane, plp->pcp, ship.shp_own, flak))
continue;
}
@ -838,8 +836,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
"Flak! Firing flak guns from unit %s (aa rating %d)\n",
prland(&land), land.lnd_aaf);
PR(land.lnd_own, msg);
if (pinflak_planedamage
(&plp->plane, plp->pcp, land.lnd_own, flak))
if (pinflak_planedamage(&plp->plane, plp->pcp, land.lnd_own, flak))
continue;
}

6
src/lib/commands/coll.c
View file

@ -108,10 +108,8 @@ coll(void)
owed *= loan.l_amtdue;
/* End overflow fix */
pr("You are owed $%.2f on that loan.\n", owed);
if (!
(p =
getstarg(player->argp[2],
"What sector do you wish to confiscate? ", buf)))
if (!(p = getstarg(player->argp[2],
"What sector do you wish to confiscate? ", buf)))
return RET_SYN;
if (!check_loan_ok(&loan))
return RET_FAIL;

8
src/lib/commands/decl.c
View file

@ -51,11 +51,9 @@ decl(void)
s_char *p;
s_char buf[1024];
if (!
(p =
getstarg(player->argp[1],
"alliance, friendly, neutrality, hostility, or war? ",
buf)))
if (!(p = getstarg(player->argp[1],
"alliance, friendly, neutrality, hostility, or war? ",
buf)))
return RET_SYN;
switch (*p) {
case 'a':

4
src/lib/commands/deli.c
View file

@ -73,7 +73,7 @@ deli(void)
while (nxtsct(&nstr, &sect) > 0) {
if (!player->owner)
continue;
del = getvar(i_del, (s_char *)&sect, EF_SECTOR);
thresh = del & ~0x7;
dir = del & 0x7;
@ -100,7 +100,7 @@ deli(void)
if (dir < 0)
return RET_SYN;
}
if (!check_sect_ok(&sect))
continue;

9
src/lib/commands/demo.c
View file

@ -64,14 +64,11 @@ demo(void)
cash = natp->nat_money;
if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
if ((p =
getstarg(player->argp[2], "Number to de-mobilize : ", buf)) == 0)
if (!(p = getstarg(player->argp[2], "Number to de-mobilize : ", buf)))
return RET_SYN;
number = atoi(p);
if (!
(p =
getstarg(player->argp[3],
"New civilians on active reserve? (y/n) ", buf)))
if (!(p = getstarg(player->argp[3],
"New civilians on active reserve? (y/n) ", buf)))
return RET_SYN;
if (*p != 'y' && *p != 'n')
return RET_SYN;

4
src/lib/commands/drop.c
View file

@ -72,8 +72,8 @@ drop(void)
wantflags = 0;
if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
return RET_SYN;
if (!snxtitem
(&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
if (!snxtitem(&ni_esc, EF_PLANE,
getstarg(player->argp[2], "escort(s)? ", buf)))
pr("No escorts...\n");
if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
|| *p == 0)

4
src/lib/commands/fly.c
View file

@ -76,8 +76,8 @@ fly(void)
wantflags = 0;
if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
return RET_SYN;
if (!snxtitem
(&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
if (!snxtitem(&ni_esc, EF_PLANE,
getstarg(player->argp[2], "escort(s)? ", buf)))
pr("No escorts...\n");
if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
|| *p == 0)

5
src/lib/commands/fuel.c
View file

@ -225,9 +225,8 @@ fuel(void)
if (!player->argp[4])
pr("%s is not in a supplied, efficient harbor\n",
prship(&item.ship));
if (!snxtitem
(&tender, EF_SHIP,
getstarg(player->argp[4], "Oiler? ", buf)))
if (!snxtitem (&tender, EF_SHIP,
getstarg(player->argp[4], "Oiler? ", buf)))
continue;
if (!check_ship_ok(&item.ship))

5
src/lib/commands/laun.c
View file

@ -217,9 +217,8 @@ launch_as(struct plnstr *pp)
pr("No satellites there!\n");
return -1;
}
if (msl_hit
(pp, plane.pln_def, EF_PLANE, N_SAT_KILL, N_SAT_KILL,
prplane(&plane), sx, sy, plane.pln_own)) {
if (msl_hit(pp, plane.pln_def, EF_PLANE, N_SAT_KILL, N_SAT_KILL,
prplane(&plane), sx, sy, plane.pln_own)) {
dam = pln_damage(pp, sx, sy, 'p', &nukedam, 1);
oldown = plane.pln_own;
planedamage(&plane, dam);

16
src/lib/commands/load.c
View file

@ -393,8 +393,8 @@ load_plane_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
}
sprintf(prompt, "Plane(s) to %s %s? ",
load_unload == LOAD ? "load onto" : "unload from", prship(sp));
if (!snxtitem
(&ni, EF_PLANE, p = getstarg(player->argp[3], prompt, buf)))
if (!snxtitem(&ni, EF_PLANE,
p = getstarg(player->argp[3], prompt, buf)))
return RET_SYN;
if (!still_ok_ship(sectp, sp))
@ -538,8 +538,8 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
}
sprintf(prompt, "Land unit(s) to %s %s? ",
load_unload == LOAD ? "load onto" : "unload from", prship(sp));
if (!snxtitem
(&ni, EF_LAND, p = getstarg(player->argp[3], prompt, buf)))
if (!snxtitem(&ni, EF_LAND,
p = getstarg(player->argp[3], prompt, buf)))
return RET_SYN;
if (!still_ok_ship(sectp, sp))
@ -858,8 +858,8 @@ load_plane_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
}
sprintf(prompt, "Plane(s) to %s %s? ",
load_unload == LOAD ? "load onto" : "unload from", prland(lp));
if (!snxtitem
(&ni, EF_PLANE, p = getstarg(player->argp[3], prompt, buf)))
if (!snxtitem(&ni, EF_PLANE,
p = getstarg(player->argp[3], prompt, buf)))
return RET_SYN;
if (!still_ok_land(sectp, lp))
@ -1085,8 +1085,8 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
}
sprintf(prompt, "Land unit(s) to %s %s? ",
load_unload == LOAD ? "load onto" : "unload from", prland(lp));
if (!snxtitem
(&ni, EF_LAND, p = getstarg(player->argp[3], prompt, buf)))
if (!snxtitem(&ni, EF_LAND,
p = getstarg(player->argp[3], prompt, buf)))
return RET_SYN;
if (!still_ok_land(sectp, lp))

4
src/lib/commands/lten.c
View file

@ -75,8 +75,8 @@ ltend(void)
if (!(ip = whatitem(player->argp[1], "Transfer what commodity? ")))
return RET_SYN;
if (!snxtitem
(&tenders, EF_SHIP, getstarg(player->argp[2], "Tender(s)? ", buf)))
if (!snxtitem(&tenders, EF_SHIP,
getstarg(player->argp[2], "Tender(s)? ", buf)))
return RET_SYN;
while (nxtitem(&tenders, (s_char *)&tender)) {
if (!player->owner)

3
src/lib/commands/mfir.c
View file

@ -829,8 +829,7 @@ quiet_bigdef(int attacker, struct emp_qelem *list, natid own, natid aown,
range = mapdist(ship.shp_x, ship.shp_y, ax, ay);
if (range > erange)
continue;
if (!line_of_sight
((s_char **)0, ship.shp_x, ship.shp_y, ax, ay))
if (!line_of_sight((s_char **)0, ship.shp_x, ship.shp_y, ax, ay))
continue;
(*nfiring)++;

7
src/lib/commands/move.c
View file

@ -413,10 +413,9 @@ would_abandon(struct sctstr *sp, int vtype, int amnt, struct lndstr *lp)
loyalcivs = 0;
/* If they have a military unit there, they still own it */
if (sp->sct_own != 0 && ((loyalcivs == 0) && (mil == 0) &&
(has_units
(sp->sct_x, sp->sct_y, sp->sct_own,
lp) == 0)))
if (sp->sct_own != 0
&& ((loyalcivs == 0) && (mil == 0)
&& (has_units(sp->sct_x, sp->sct_y, sp->sct_own, lp) == 0)))
return 1;
return 0;

4
src/lib/commands/para.c
View file

@ -77,8 +77,8 @@ para(void)
wantflags = P_P;
if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
return RET_SYN;
if (!snxtitem
(&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
if (!snxtitem(&ni_esc, EF_PLANE,
getstarg(player->argp[2], "escort(s)? ", buf)))
pr("No escorts...\n");
if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
|| *p == 0)

2
src/lib/commands/real.c
View file

@ -132,7 +132,7 @@ dreal()
}
pr("Realms for %s (#%d)\n",cname(nat),nat);
natp = getnatp(nat);
abs.width = 0;
abs.width = 0;
abs.height = 0;
while (curr <= lastr) {
b = &natp->nat_b[curr];

4
src/lib/commands/reco.c
View file

@ -71,8 +71,8 @@ reco(void)
wantflags = 0;
if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
return RET_SYN;
if (!snxtitem
(&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
if (!snxtitem(&ni_esc, EF_PLANE,
getstarg(player->argp[2], "escort(s)? ", buf)))
pr("No escorts...\n");
if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
|| *p == 0)

37
src/lib/commands/repo.c
View file

@ -204,29 +204,22 @@ printdiff(int mystat, double ours, struct natstr *natp, int what)
if (tolerance > 2 * ours)
tolerance = (int)(2 * ours);
if (check(buf, theirs, 2 * ours, -1.0, shift, what, tolerance)) ;
else if (check
(buf, theirs, 1.5 * ours, 2.0 * ours, shift, what,
else if (check(buf, theirs, 1.5 * ours, 2.0 * ours, shift, what,
tolerance)) ;
else if (check(buf, theirs, 1.2 * ours, 1.5 * ours, shift, what,
tolerance)) ;
else if (check
(buf, theirs, 1.2 * ours, 1.5 * ours, shift, what,
tolerance)) ;
else if (check
(buf, theirs, 1.1 * ours, 1.2 * ours, shift, what,
tolerance)) ;
else if (check
(buf, theirs, ours / 1.1, 1.1 * ours, shift, what,
tolerance)) ;
else if (check
(buf, theirs, ours / 1.2, ours / 1.1, shift, what,
tolerance)) ;
else if (check
(buf, theirs, ours / 1.5, ours / 1.2, shift, what,
tolerance)) ;
else if (check
(buf, theirs, ours / 2.0, ours / 1.5, shift, what,
tolerance)) ;
else if (check
(buf, theirs, -1.0, ours / 2.0, shift, what, tolerance)) ;
else if (check(buf, theirs, 1.1 * ours, 1.2 * ours, shift, what,
tolerance)) ;
else if (check(buf, theirs, ours / 1.1, 1.1 * ours, shift, what,
tolerance)) ;
else if (check(buf, theirs, ours / 1.2, ours / 1.1, shift, what,
tolerance)) ;
else if (check(buf, theirs, ours / 1.5, ours / 1.2, shift, what,
tolerance)) ;
else if (check(buf, theirs, ours / 2.0, ours / 1.5, shift, what,
tolerance)) ;
else if (check(buf, theirs, -1.0, ours / 2.0, shift, what,
tolerance)) ;
else
sprintf(buf, " n/a");
} else

3
src/lib/commands/swap.c
View file

@ -68,8 +68,7 @@ swaps(void)
!getsect(sectb.sct_x, sectb.sct_y, &sectb))
return RET_SYN;
print_res(&sectb);
if (!confirm
("Are you sure these are the two sectors you wish to swap? "))
if (!confirm ("Are you sure these are the two sectors you wish to swap? "))
return RET_FAIL;
/* save x and y from secta */
x = secta.sct_x;

4
src/lib/commands/tend.c
View file

@ -87,8 +87,8 @@ tend(void)
return RET_SYN;
}
if (!snxtitem
(&tenders, EF_SHIP, getstarg(player->argp[2], "Tender(s)? ", buf)))
if (!snxtitem(&tenders, EF_SHIP,
getstarg(player->argp[2], "Tender(s)? ", buf)))
return RET_SYN;
while (nxtitem(&tenders, (s_char *)&tender)) {

3
src/lib/commands/trad.c
View file

@ -330,8 +330,7 @@ check_trade(void)
continue;
}
if (tg.gen.trg_own != trade.trd_owner) {
logerror
("SOmething weird, tg.gen.trg_own != trade.trd_owner!\n");
logerror("Something weird, tg.gen.trg_own != trade.trd_owner!\n");
trade.trd_unitid = -1;
puttrade(n, &trade);
continue;

4
src/lib/common/bestpath.c
View file

@ -204,8 +204,8 @@ bestownedpath(s_char *bpath,
tx = XNORM(tx);
ty = YNORM(ty);
if (mapindex[tx][ty] == 0xFFFF) {
if (owned_and_navigable
(bigmap, tx, ty, terrain, own)
if (owned_and_navigable(bigmap, tx, ty,
terrain, own)
|| (tx == ex && ty == ey && !restr2)) {
mapindex[tx][ty] =
((i + 1) << 13) + routelen;

5
src/lib/common/file.c
View file

@ -294,9 +294,8 @@ ef_write(int type, int id, caddr_t ptr)
}
if (id >= ep->fids) {
if (ep->flags & EFF_MEM) {
logerror
("file %s went beyond %d items; won't be able toread item w/o restart",
ep->name, ep->fids);
logerror("file %s went beyond %d items; won't be able toread item w/o restart",
ep->name, ep->fids);
} else {
/* write expanded file; ep->fids = last id + 1 */
ep->fids = id + 1;

3
src/lib/lwp/lwp.c
View file

@ -448,8 +448,7 @@ lwpInitSystem(int pri, char **ctxptr, int flags)
if (pri < 1)
pri = 1;
/* *LwpContextPtr = 0; */
if (!
(LwpCurrent = (struct lwpProc *)calloc(1, sizeof(struct lwpProc))))
if (!(LwpCurrent = calloc(1, sizeof(struct lwpProc))))
return (0);
if (!(stack = (int *)malloc(64)))
return (0);

3
src/lib/player/accept.c
View file

@ -226,8 +226,7 @@ player_accept(void *unused)
exit(1);
}
#else
logerror
("Alpha/Linux? You don't support SO_REUSEADDR yet, do you?\n");
logerror("Alpha/Linux? You don't support SO_REUSEADDR yet, do you?\n");
#endif
if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
logerror("inet socket bind");

32
src/lib/subs/attsub.c
View file

@ -578,9 +578,7 @@ att_abort(int combat_mode, struct combat *off, struct combat *def)
&& (sect.sct_oldown != player->cnum)
&& (issneak != SITZKRIEG) && (issneak != MOBILIZATION)) {
pr("You're not at war with them!\n");
if (!confirm
("Do you really want to sneak attack (it will cost you $5000) [yn]? "))
{
if (!confirm("Do you really want to sneak attack (it will cost you $5000) [yn]? ")) {
pr("Sneak attack cancelled!\n");
return abort_attack();
}
@ -779,36 +777,29 @@ att_ask_support(int offset, int *fortp, int *shipp, int *landp,
*fortp = *shipp = 0;
*landp = *planep = 0;
if (!
(p =
getstarg(player->argp[offset], "Use fort support? ", buf)))
if (!(p = getstarg(player->argp[offset], "Use fort support? ",
buf)))
return RET_SYN;
if ((*p == 'y') || (*p == 'Y'))
*fortp = 1;
if (!
(p =
getstarg(player->argp[offset + 1], "Use ship support? ",
buf)))
if (!(p = getstarg(player->argp[offset + 1], "Use ship support? ",
buf)))
return RET_SYN;
if ((*p == 'y') || (*p == 'Y'))
*shipp = 1;
if (!
(p =
getstarg(player->argp[offset + 2], "Use land support? ",
buf)))
if (!(p = getstarg(player->argp[offset + 2], "Use land support? ",
buf)))
return RET_SYN;
if ((*p == 'y') || (*p == 'Y'))
*landp = 1;
if (!
(p =
getstarg(player->argp[offset + 3], "Use plane support? ",
buf)))
if (!p = getstarg(player->argp[offset + 3], "Use plane support? ",
buf)))
return RET_SYN;
if ((*p == 'y') || (*p == 'Y'))
@ -1597,10 +1588,7 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
continue;
getsect(def->x, def->y, &dsect);
if (!
(p =
(s_char *)BestLandPath(buf, &sect, &dsect, &move_cost,
MOB_ROAD)))
if (!(p = BestLandPath(buf, &sect, &dsect, &move_cost, MOB_ROAD)))
continue;
mobcost = land.lnd_effic * 0.01 * lchr[(int)land.lnd_type].l_spd;

9
src/lib/subs/plnsub.c
View file

@ -109,11 +109,10 @@ pln_onewaymission(struct sctstr *target, int *shipno, int *flagp)
if (!(p = getstarg(0, "Carrier #? ", buf)) || !*p)
break;
n = atoi(p);
if (n < 0 || !getship(n, &ship) || (!player->owner &&
(getrel
(getnatp(ship.shp_own),
player->cnum) !=
ALLIED))) {
if (n < 0 || !getship(n, &ship)
|| (!player->owner
&& (getrel(getnatp(ship.shp_own), player->cnum)
!= ALLIED))) {
pr("Not yours\n");
continue;
}

10
src/server/shutdown.c
View file

@ -82,13 +82,11 @@ shutdown_sequence(void *unused)
shutdown_pending);
} else if (shutdown_pending <= 60
&& shutdown_pending % 10 == 0) {
pr_wall
("%sThe server will be shutting down in %d minutes!\n",
header, shutdown_pending);
pr_wall("%sThe server will be shutting down in %d minutes!\n",
header, shutdown_pending);
} else if (shutdown_pending % 60 == 0) {
pr_wall
("%sThe server will be shutting down %d hours from now.\n",
header, (int)(shutdown_pending / 60));
pr_wall("%sThe server will be shutting down %d hours from now.\n",
header, (int)(shutdown_pending / 60));
}
}
empth_sleep(now + 60);

5
src/util/land.c
View file

@ -112,9 +112,8 @@ s_char **argv;
int big;
if (argc > 1 && argc != 6) {
printf
("usage: %s sectrange mincontdist chunksize numchunks numisle\n",
*argv);
printf("usage: %s sectrange mincontdist chunksize numchunks numisle\n",
*argv);
return -1;
}
if (argc == 6) {