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

Line breaks and other formatting issues. No functional changes.

Browse source
This commit is contained in:
Markus Armbruster 2006-05-21 13:05:24 +00:00
parent 281840b604
commit 4c4fdca42b
37 changed files with 119 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -250,8 +250,8 @@ grab_sect(struct sctstr *sp, natid to)
if (lp->lnd_own != player->cnum)
continue;
wu(0, to, "\t%s ceded to you by %s\n", prland(lp),
cname(player->cnum));
wu(0, to, "\t%s ceded to you by %s\n",
prland(lp), cname(player->cnum));
makelost(EF_LAND, lp->lnd_own, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
makenotlost(EF_LAND, to, lp->lnd_uid, lp->lnd_x, lp->lnd_y);
lp->lnd_own = to;

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

@ -96,7 +96,7 @@ do_conv(struct nstr_sect nstr, int uwtoconvert, int for_real)
/*
* Military units count according to the number of
* mil in them. (i.e. attack/defense modified don't
* mil in them. (i.e. attack/defense modifier don't
* count.
*/
snxtitem_xy(&ni, EF_LAND, sect.sct_x, sect.sct_y);

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

@ -78,8 +78,8 @@ foll(void)
if (!player->owner)
continue;
if (ship.shp_x != x || ship.shp_y != y) {
pr("Ship #%d not in same sector as #%d\n", ship.shp_uid,
leader);
pr("Ship #%d not in same sector as #%d\n",
ship.shp_uid, leader);
continue;
}
if (ship.shp_uid == leader) {

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

@ -97,10 +97,12 @@ look(void)
civ = sect.sct_item[I_CIVIL];
mil = sect.sct_item[I_MILIT];
if (civ)
pr("with %s%d civ ", player->owner ? "" : "approx ",
pr("with %s%d civ ",
player->owner ? "" : "approx ",
player->owner ? civ : roundintby(civ, 10));
if (mil)
pr("with %s%d mil ", player->owner ? "" : "approx ",
pr("with %s%d mil ",
player->owner ? "" : "approx ",
player->owner ? mil : roundintby(mil, 10));
pr("@ %s\n", xyas(x, y, player->cnum));
if (opt_HIDDEN) {

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

@ -342,8 +342,8 @@ multifire(void)
continue;
}
if (fship.shp_effic < 60) {
pr("Ship #%d is crippled (%d%%)\n", fshipno,
fship.shp_effic);
pr("Ship #%d is crippled (%d%%)\n",
fshipno, fship.shp_effic);
continue;
}
range = effrange(fship.shp_frnge, fship.shp_tech);

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

@ -170,8 +170,9 @@ move(void)
}
amt_src = start.sct_item[vtype];
if (amt_src < amount) {
pr("Only %d %s left in %s!\n", amt_src,
ip->i_name, xyas(start.sct_x, start.sct_y, player->cnum));
pr("Only %d %s left in %s!\n",
amt_src, ip->i_name,
xyas(start.sct_x, start.sct_y, player->cnum));
amount = amt_src;
amt_src = 0;
} else

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

@ -451,14 +451,14 @@ sorde(void)
if (ship.shp_autonav & AN_AUTONAV) {
/* Destination 1 */
prxy(" %3d,%-3d", ship.shp_destx[1],
ship.shp_desty[1], player->cnum);
prxy(" %3d,%-3d",
ship.shp_destx[1], ship.shp_desty[1], player->cnum);
/* Destination 2 */
if ((ship.shp_destx[1] != ship.shp_destx[0])
|| (ship.shp_desty[1] != ship.shp_desty[0])) {
prxy(" %3d,%-3d", ship.shp_destx[0],
ship.shp_desty[0], player->cnum);
prxy(" %3d,%-3d",
ship.shp_destx[0], ship.shp_desty[0], player->cnum);
} else
pr(" ");

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

@ -62,8 +62,8 @@ range(void)
continue;
plane.pln_range = (plane.pln_range_max < i) ?
plane.pln_range_max : i;
pr("Plane %d range changed to %d\n", plane.pln_uid,
plane.pln_range);
pr("Plane %d range changed to %d\n",
plane.pln_uid, plane.pln_range);
putplane(plane.pln_uid, &plane);
}
@ -96,8 +96,8 @@ lrange(void)
if ((i = atoi(p)) < 0)
continue;
land.lnd_rad_max = (i < land.lnd_rad) ? i : land.lnd_rad;
pr("%s reaction radius changed to %d\n", prland(&land),
land.lnd_rad_max);
pr("%s reaction radius changed to %d\n",
prland(&land), land.lnd_rad_max);
putland(land.lnd_uid, &land);
}

12
src/lib/commands/sona.c
View file

@ -191,12 +191,12 @@ sona(void)
prship(&targ),
xyas(targ.shp_x, targ.shp_y, player->cnum));
else
pr("Sonar detects %s %s @ %s\n", cname(targ.shp_own),
prship(&targ),
pr("Sonar detects %s %s @ %s\n",
cname(targ.shp_own), prship(&targ),
xyas(targ.shp_x, targ.shp_y, player->cnum));
} else
pr("Sonar detects %s %s @ %s\n", cname(targ.shp_own),
prship(&targ),
pr("Sonar detects %s %s @ %s\n",
cname(targ.shp_own), prship(&targ),
xyas(targ.shp_x, targ.shp_y, player->cnum));
if (targ.shp_visib > vis[y][x]) {
@ -295,8 +295,8 @@ plane_sona(struct emp_qelem *plane_list, int x, int y,
prship(targ),
xyas(targ->shp_x, targ->shp_y, pp->pln_own));
else
mpr(pp->pln_own, "%s %s @ %s\n", cname(targ->shp_own),
prship(targ),
mpr(pp->pln_own, "%s %s @ %s\n",
cname(targ->shp_own), prship(targ),
xyas(targ->shp_x, targ->shp_y, pp->pln_own));
}
}

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

@ -109,8 +109,8 @@ torp(void)
continue;
}
if ((mchr[(int)sub.shp_type].m_flags & M_TORP) == 0) {
pr("Ship # %d: A %s can't fire torpedoes!\n", sub.shp_uid,
mchr[(int)sub.shp_type].m_name);
pr("Ship # %d: A %s can't fire torpedoes!\n",
sub.shp_uid, mchr[(int)sub.shp_type].m_name);
continue;
}
shells = sub.shp_item[I_SHELL];

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

@ -114,8 +114,8 @@ trad(void)
TRADE_DELAY / 3600.0 - (now - trade.trd_markettime) / 3600.0;
if (tleft < 0.0)
tleft = 0.0;
pr("$%7ld %2d %5.2f hrs ", trade.trd_price,
trade.trd_maxbidder, tleft);
pr("$%7ld %2d %5.2f hrs ",
trade.trd_price, trade.trd_maxbidder, tleft);
(void)trade_desc(&trade, &tg); /* XXX */
pr("\n");
if (trade.trd_owner == player->cnum && !player->god)

24
src/lib/commands/upgr.c
View file

@ -128,8 +128,8 @@ lupgr(void)
continue;
}
if (land.lnd_tech >= tlev) {
pr("%s tech: %d, yours is only %d\n", prland(&land),
land.lnd_tech, tlev);
pr("%s tech: %d, yours is only %d\n",
prland(&land), land.lnd_tech, tlev);
continue;
}
cost = lp->l_cost * UPGR_COST / 100;
@ -149,8 +149,8 @@ lupgr(void)
putland(land.lnd_uid, &land);
putsect(&sect);
player->dolcost += cost;
pr("%s upgraded to tech %d, at a cost of %d\n", prland(&land),
land.lnd_tech, cost);
pr("%s upgraded to tech %d, at a cost of %d\n",
prland(&land), land.lnd_tech, cost);
if (land.lnd_own != player->cnum)
wu(0, land.lnd_own,
"%s upgraded by %s to tech %d, at a cost of %d\n",
@ -212,8 +212,8 @@ supgr(void)
continue;
}
if (ship.shp_tech >= tlev) {
pr("%s tech: %d, yours is only %d\n", prship(&ship),
ship.shp_tech, tlev);
pr("%s tech: %d, yours is only %d\n",
prship(&ship), ship.shp_tech, tlev);
continue;
}
cost = mp->m_cost * UPGR_COST / 100;
@ -232,8 +232,8 @@ supgr(void)
putship(ship.shp_uid, &ship);
putsect(&sect);
player->dolcost += cost;
pr("%s upgraded to tech %d, at a cost of %d\n", prship(&ship),
ship.shp_tech, cost);
pr("%s upgraded to tech %d, at a cost of %d\n",
prship(&ship), ship.shp_tech, cost);
if (ship.shp_own != player->cnum)
wu(0, ship.shp_own,
"%s upgraded by %s to tech %d, at a cost of %d\n",
@ -295,8 +295,8 @@ pupgr(void)
continue;
}
if (plane.pln_tech >= tlev) {
pr("%s tech: %d, yours is only %d\n", prplane(&plane),
plane.pln_tech, tlev);
pr("%s tech: %d, yours is only %d\n",
prplane(&plane), plane.pln_tech, tlev);
continue;
}
cost = pp->pl_cost * UPGR_COST / 100;
@ -320,8 +320,8 @@ pupgr(void)
putplane(plane.pln_uid, &plane);
putsect(&sect);
player->dolcost += cost;
pr("%s upgraded to tech %d, at a cost of %d\n", prplane(&plane),
plane.pln_tech, cost);
pr("%s upgraded to tech %d, at a cost of %d\n",
prplane(&plane), plane.pln_tech, cost);
if (plane.pln_own != player->cnum)
wu(0, plane.pln_own,
"%s upgraded by %s to tech %d, at a cost of %d\n",