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

Spelling corrections

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-07-30 16:49:03 +02:00
parent 644817993b
commit e6ce36df64
20 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/empio.h
View file

@ -24,7 +24,7 @@
* *
* --- * ---
* *
* empio.h: Describes io pointers used in Empire * empio.h: Describes I/O pointers used in Empire
* *
* Known contributors to this file: * Known contributors to this file:
* Markus Armbruster, 2004-2012 * Markus Armbruster, 2004-2012

2
include/nsc.h
View file

@ -152,7 +152,7 @@ enum ns_seltype {
/* Sector iterator */ /* Sector iterator */
struct nstr_sect { struct nstr_sect {
coord x, y; /* current x-y */ coord x, y; /* current x-y */
coord dx, dy; /* accumlated x,y travel */ coord dx, dy; /* accumulated x,y travel */
int id; /* return value of sctoff */ int id; /* return value of sctoff */
enum ns_seltype type; /* selection type: NS_AREA or NS_DIST */ enum ns_seltype type; /* selection type: NS_AREA or NS_DIST */
int curdist; /* NS_DIST: current range */ int curdist; /* NS_DIST: current range */

2
info/shark.t
View file

@ -8,7 +8,7 @@ owner. The <LOAN #> is the number of the loan you wish to buy.
The loan must be in arrears. The holder of the note will recieve The loan must be in arrears. The holder of the note will recieve
the value of the loan plus one periods worth of interest from your the value of the loan plus one periods worth of interest from your
treasury. The player who owes the money on the loan will be notified treasury. The player who owes the money on the loan will be notified
of the switch. After the loan is transfered you may collect on it as of the switch. After the loan is transferred you may collect on it as
normal. normal.
.sp .sp
.SA "offer, consider, collect, financial, Loans" .SA "offer, consider, collect, financial, Loans"

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

@ -109,7 +109,7 @@ anti(void)
sect.sct_che_target = 0; sect.sct_che_target = 0;
sect.sct_che = ache; sect.sct_che = ache;
putsect(&sect); putsect(&sect);
pr(" Body count: Military %d - Guerillas %d.\n", pr(" Body count: Military %d - Guerrillas %d.\n",
milkilled, chekilled); milkilled, chekilled);
if (ache == 0) { if (ache == 0) {
pr(" Partisans cleared out of this sector for now.\n"); pr(" Partisans cleared out of this sector for now.\n");
@ -147,7 +147,7 @@ anti(void)
xyas(nstr.x, nstr.y, sect.sct_oldown)); xyas(nstr.x, nstr.y, sect.sct_oldown));
} }
} else { } else {
pr(" Body count: Military 0 - Guerillas 0.\n"); pr(" Body count: Military 0 - Guerrillas 0.\n");
pr(" Partisans cleared out of this sector for now.\n"); pr(" Partisans cleared out of this sector for now.\n");
} }
} }

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

@ -132,7 +132,7 @@ budg(void)
pr("Estimated new treasury%s\n", pr("Estimated new treasury%s\n",
dotsprintf(buf, "%50d", np->nat_money + income - expenses)); dotsprintf(buf, "%50d", np->nat_money + income - expenses));
if (np->nat_money + income - expenses < 0 && !player->god) { if (np->nat_money + income - expenses < 0 && !player->god) {
pr("After processsing sectors, you will be broke!\n"); pr("After processing sectors, you will be broke!\n");
pr("Sectors will not produce, distribute, or deliver!\n\n"); pr("Sectors will not produce, distribute, or deliver!\n\n");
} }

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

@ -254,7 +254,7 @@ loan_accept(struct ltcomstr *ltcp)
} }
/* /*
* Declne a loan. Return RET_OK on success, anything else on error. * Decline a loan. Return RET_OK on success, anything else on error.
*/ */
static int static int
loan_decline(struct ltcomstr *ltcp) loan_decline(struct ltcomstr *ltcp)

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

@ -455,7 +455,7 @@ edit_sect_i(struct sctstr *sect, char *key, int arg)
break; break;
case 'x': case 'x':
new = LIMIT_TO(arg, 0, CHE_MAX); new = LIMIT_TO(arg, 0, CHE_MAX);
divine_sct_change_quiet(sect, "Guerillas", new != sect->sct_che, divine_sct_change_quiet(sect, "Guerrillas", new != sect->sct_che,
"from %d to %d", sect->sct_che, new); "from %d to %d", sect->sct_che, new);
sect->sct_che = new; sect->sct_che = new;
break; break;

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

@ -156,7 +156,7 @@ head_describe(struct histstr *hp, int what, char *aname, char *vname)
break; break;
case 1: case 1:
if (hp->h_recent < -16) if (hp->h_recent < -16)
pr("%s agression against %s has lessened slightly", pr("%s aggression against %s has lessened slightly",
aname, vname); aname, vname);
else else
pr("Peace talks may occur between %s & %s", aname, vname); pr("Peace talks may occur between %s & %s", aname, vname);

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

@ -88,7 +88,7 @@ laun(void)
} }
if (opt_MARKET) { if (opt_MARKET) {
if (ontradingblock(EF_PLANE, &plane)) { if (ontradingblock(EF_PLANE, &plane)) {
pr("plane #%d inelligible - it's for sale.\n", pr("plane #%d ineligible - it's for sale.\n",
plane.pln_uid); plane.pln_uid);
continue; continue;
} }

6
src/lib/gen/ioqueue.c
View file

@ -31,8 +31,8 @@
*/ */
/* /*
* Read and write onto io queues. Note that * Read and write onto I/O queues. Note that
* the io queues don't actually do any writing; * the I/O queues don't actually do any writing;
* that is left for a higher level. * that is left for a higher level.
*/ */
@ -321,7 +321,7 @@ appendcc(struct ioqueue *ioq, char *buf, int cc)
/* /*
* remove cc bytes from ioqueue ioq * remove cc bytes from ioqueue ioq
* free memory, dequeue io elements * free memory, dequeue I/O elements
* which are no longer used. * which are no longer used.
*/ */
static int static int

2
src/lib/global/news.c
View file

@ -185,7 +185,7 @@ struct rptstr rpt[] = {
"ground troops hit by missile" } }, "ground troops hit by missile" } },
{ N_AWON_SECT, -4, N_FRONT, { "navy secures a beachhead on %s territory", { N_AWON_SECT, -4, N_FRONT, { "navy secures a beachhead on %s territory",
"sailors take a coastal sector from %s" } }, "sailors take a coastal sector from %s" } },
{ N_PWON_SECT, -4, N_FRONT, { "paratroopers comandeer a sector from %s", { N_PWON_SECT, -4, N_FRONT, { "paratroopers commandeer a sector from %s",
"air force parachutists overwhelm a %s sector" } }, "air force parachutists overwhelm a %s sector" } },
{ N_PARA_UNOCC, 0, N_COLONY,{ "parachutists grab unoccupied land", { N_PARA_UNOCC, 0, N_COLONY,{ "parachutists grab unoccupied land",
"paratroopers break new ground" } }, "paratroopers break new ground" } },

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

@ -89,7 +89,7 @@ caploss(struct sctstr *sp, natid coun, char *msg)
if (loan.l_status == LS_SIGNED && loan.l_loner == coun) { if (loan.l_status == LS_SIGNED && loan.l_loner == coun) {
loan.l_loner = player->cnum; loan.l_loner = player->cnum;
putloan(loan_num, &loan); putloan(loan_num, &loan);
pr("Loan %d has been transfered over to you\n", loan_num); pr("Loan %d has been transferred over to you\n", loan_num);
} }
} }
} }

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

@ -581,7 +581,7 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
continue; continue;
if (opt_MARKET) { if (opt_MARKET) {
if (ontradingblock(EF_PLANE, &plane)) { if (ontradingblock(EF_PLANE, &plane)) {
pr("plane #%d inelligible - it's for sale.\n", pr("plane #%d ineligible - it's for sale.\n",
plane.pln_uid); plane.pln_uid);
continue; continue;
} }

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

@ -273,7 +273,7 @@ show_ship_capab(int tlev)
int i; int i;
struct mchrstr *mp; struct mchrstr *mp;
pr("%25s cargos & capabilities\n", ""); pr("%25s cargoes & capabilities\n", "");
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
mp = &mchr[chridx[i].type]; mp = &mchr[chridx[i].type];
pr("%-25.25s ", mp->m_name); pr("%-25.25s ", mp->m_name);
@ -546,7 +546,7 @@ show_news(int tlev)
int i, j; int i, j;
pr("id category good will\n"); pr("id category good will\n");
pr(" messsages\n"); pr(" messages\n");
for (i = 1; i < N_MAX_VERB + 1; i++) { for (i = 1; i < N_MAX_VERB + 1; i++) {
if (rpt[i].r_newspage == N_NOTUSED) if (rpt[i].r_newspage == N_NOTUSED)

4
src/lib/w32/w32sockets.c
View file

@ -221,8 +221,8 @@ w32_socket(int domain, int type, int protocol)
SOCKET sock; SOCKET sock;
/* /*
* We have to use WSASocket() to create non-overlapped IO sockets. * We have to use WSASocket() to create non-overlapped I/O sockets.
* Overlapped IO sockets cannot be used with read/write. * Overlapped I/O sockets cannot be used with read/write.
*/ */
sock = WSASocket(domain, type, protocol, NULL, 0, 0); sock = WSASocket(domain, type, protocol, NULL, 0, 0);
if (sock == INVALID_SOCKET) { if (sock == INVALID_SOCKET) {

2
src/util/fairland.c
View file

@ -237,7 +237,7 @@ main(int argc, char *argv[])
qprint("\ntry #%d (out of %d)...\n", i + 1, NUMTRIES); qprint("\ntry #%d (out of %d)...\n", i + 1, NUMTRIES);
qprint("placing capitals...\n"); qprint("placing capitals...\n");
if (!drift()) if (!drift())
qprint("fairland: unstable drift -- try increasisg DRIFT_MAX\n"); qprint("fairland: unstable drift -- try increasing DRIFT_MAX\n");
qprint("growing continents...\n"); qprint("growing continents...\n");
grow_continents(); grow_continents();
} while (fl_status && ++i < NUMTRIES); } while (fl_status && ++i < NUMTRIES);

8
tests/actofgod/journal.log
View file

@ -507,19 +507,19 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit l 1,1 x 0 Play#0 input edit l 1,1 x 0
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Guerillas of 1,1 unchanged Play#0 output Play#0 1 Guerrillas of 1,1 unchanged
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit l 3,1 x -1 Play#0 input edit l 3,1 x -1
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Guerillas of 3,1 unchanged Play#0 output Play#0 1 Guerrillas of 3,1 unchanged
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit l 5,1 x 255 Play#0 input edit l 5,1 x 255
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Guerillas of 5,1 changed from 0 to 255 Play#0 output Play#0 1 Guerrillas of 5,1 changed from 0 to 255
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit l 7,1 x 256 Play#0 input edit l 7,1 x 256
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Guerillas of 7,1 changed from 0 to 255 Play#0 output Play#0 1 Guerrillas of 7,1 changed from 0 to 255
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit l 1,1 p 0 Play#0 input edit l 1,1 p 0
Play#0 command edit Play#0 command edit

2
tests/smoke/journal.log
View file

@ -3329,7 +3329,7 @@
Play#1 output Play#1 1 sect subversion activity report Play#1 output Play#1 1 sect subversion activity report
Play#1 output Play#1 1 ---- -------------------------- Play#1 output Play#1 1 ---- --------------------------
Play#1 output Play#1 1 11,-1 Sector mobility/troop strength will allow 23 troops to engage. Play#1 output Play#1 1 11,-1 Sector mobility/troop strength will allow 23 troops to engage.
Play#1 output Play#1 1 Body count: Military 0 - Guerillas 0. Play#1 output Play#1 1 Body count: Military 0 - Guerrillas 0.
Play#1 output Play#1 1 Partisans cleared out of this sector for now. Play#1 output Play#1 1 Partisans cleared out of this sector for now.
Play#1 output Play#1 1 1 sector Play#1 output Play#1 1 1 sector
Play#1 output Play#1 6 0 543 Play#1 output Play#1 6 0 543

2
tests/update/journal.log
View file

@ -237,7 +237,7 @@
Play#2 output Play#2 1 Balance forward 100 Play#2 output Play#2 1 Balance forward 100
Play#2 output Play#2 1 Estimated delta -6684 Play#2 output Play#2 1 Estimated delta -6684
Play#2 output Play#2 1 Estimated new treasury.............................................-6584 Play#2 output Play#2 1 Estimated new treasury.............................................-6584
Play#2 output Play#2 1 After processsing sectors, you will be broke! Play#2 output Play#2 1 After processing sectors, you will be broke!
Play#2 output Play#2 1 Sectors will not produce, distribute, or deliver! Play#2 output Play#2 1 Sectors will not produce, distribute, or deliver!
Play#2 output Play#2 1 Play#2 output Play#2 1
Play#2 output Play#2 6 0 99 Play#2 output Play#2 6 0 99

6
tests/version/journal.log
View file

@ -232,7 +232,7 @@
Play#0 input show ship c Play#0 input show ship c
Play#0 command show Play#0 command show
Play#0 output Play#0 1 Printing for tech level '1000' Play#0 output Play#0 1 Printing for tech level '1000'
Play#0 output Play#0 1 cargos & capabilities Play#0 output Play#0 1 cargoes & capabilities
Play#0 output Play#0 1 fb fishing boat 300c 10m 900f 15u fish canal Play#0 output Play#0 1 fb fishing boat 300c 10m 900f 15u fish canal
Play#0 output Play#0 1 ss slave ship 20c 80m 200f 1200u Play#0 output Play#0 1 ss slave ship 20c 80m 200f 1200u
Play#0 output Play#0 1 frg frigate 60m 10s 2g 60f semi-land Play#0 output Play#0 1 frg frigate 60m 10s 2g 60f semi-land
@ -1822,7 +1822,7 @@
Play#0 output Play#0 1 71 "missile\\040fired\\040at\\040%s\\040ground\\040troops" "missile\\040hits\\040%s\\040troops" 2 5 Play#0 output Play#0 1 71 "missile\\040fired\\040at\\040%s\\040ground\\040troops" "missile\\040hits\\040%s\\040troops" 2 5
Play#0 output Play#0 1 72 "regiment\\040struck\\040by\\040sub-launched\\040missile" "ground\\040troops\\040hit\\040by\\040missile" 0 5 Play#0 output Play#0 1 72 "regiment\\040struck\\040by\\040sub-launched\\040missile" "ground\\040troops\\040hit\\040by\\040missile" 0 5
Play#0 output Play#0 1 73 "navy\\040secures\\040a\\040beachhead\\040on\\040%s\\040territory" "sailors\\040take\\040a\\040coastal\\040sector\\040from\\040%s" -4 2 Play#0 output Play#0 1 73 "navy\\040secures\\040a\\040beachhead\\040on\\040%s\\040territory" "sailors\\040take\\040a\\040coastal\\040sector\\040from\\040%s" -4 2
Play#0 output Play#0 1 74 "paratroopers\\040comandeer\\040a\\040sector\\040from\\040%s" "air\\040force\\040parachutists\\040overwhelm\\040a\\040%s\\040sector" -4 2 Play#0 output Play#0 1 74 "paratroopers\\040commandeer\\040a\\040sector\\040from\\040%s" "air\\040force\\040parachutists\\040overwhelm\\040a\\040%s\\040sector" -4 2
Play#0 output Play#0 1 75 "parachutists\\040grab\\040unoccupied\\040land" "paratroopers\\040break\\040new\\040ground" 0 8 Play#0 output Play#0 1 75 "parachutists\\040grab\\040unoccupied\\040land" "paratroopers\\040break\\040new\\040ground" 0 8
Play#0 output Play#0 1 76 "sailors\\040repelled\\040by\\040%s\\040coast-guard" "naval\\040forces\\040massacred\\040in\\040failed\\040assault\\040of\\040%s" 4 2 Play#0 output Play#0 1 76 "sailors\\040repelled\\040by\\040%s\\040coast-guard" "naval\\040forces\\040massacred\\040in\\040failed\\040assault\\040of\\040%s" 4 2
Play#0 output Play#0 1 77 "paratroopers\\040destroyed\\040in\\040failed\\040air-assault\\040on\\040%s" "loses\\040parachutists\\040in\\040failed\\040air-assault\\040of\\040%s" 4 2 Play#0 output Play#0 1 77 "paratroopers\\040destroyed\\040in\\040failed\\040air-assault\\040on\\040%s" "loses\\040parachutists\\040in\\040failed\\040air-assault\\040of\\040%s" 4 2
@ -2473,7 +2473,7 @@
Play#1 output Play#1 1 71 "missile\\040fired\\040at\\040%s\\040ground\\040troops" "missile\\040hits\\040%s\\040troops" 2 5 Play#1 output Play#1 1 71 "missile\\040fired\\040at\\040%s\\040ground\\040troops" "missile\\040hits\\040%s\\040troops" 2 5
Play#1 output Play#1 1 72 "regiment\\040struck\\040by\\040sub-launched\\040missile" "ground\\040troops\\040hit\\040by\\040missile" 0 5 Play#1 output Play#1 1 72 "regiment\\040struck\\040by\\040sub-launched\\040missile" "ground\\040troops\\040hit\\040by\\040missile" 0 5
Play#1 output Play#1 1 73 "navy\\040secures\\040a\\040beachhead\\040on\\040%s\\040territory" "sailors\\040take\\040a\\040coastal\\040sector\\040from\\040%s" -4 2 Play#1 output Play#1 1 73 "navy\\040secures\\040a\\040beachhead\\040on\\040%s\\040territory" "sailors\\040take\\040a\\040coastal\\040sector\\040from\\040%s" -4 2
Play#1 output Play#1 1 74 "paratroopers\\040comandeer\\040a\\040sector\\040from\\040%s" "air\\040force\\040parachutists\\040overwhelm\\040a\\040%s\\040sector" -4 2 Play#1 output Play#1 1 74 "paratroopers\\040commandeer\\040a\\040sector\\040from\\040%s" "air\\040force\\040parachutists\\040overwhelm\\040a\\040%s\\040sector" -4 2
Play#1 output Play#1 1 75 "parachutists\\040grab\\040unoccupied\\040land" "paratroopers\\040break\\040new\\040ground" 0 8 Play#1 output Play#1 1 75 "parachutists\\040grab\\040unoccupied\\040land" "paratroopers\\040break\\040new\\040ground" 0 8
Play#1 output Play#1 1 76 "sailors\\040repelled\\040by\\040%s\\040coast-guard" "naval\\040forces\\040massacred\\040in\\040failed\\040assault\\040of\\040%s" 4 2 Play#1 output Play#1 1 76 "sailors\\040repelled\\040by\\040%s\\040coast-guard" "naval\\040forces\\040massacred\\040in\\040failed\\040assault\\040of\\040%s" 4 2
Play#1 output Play#1 1 77 "paratroopers\\040destroyed\\040in\\040failed\\040air-assault\\040on\\040%s" "loses\\040parachutists\\040in\\040failed\\040air-assault\\040of\\040%s" 4 2 Play#1 output Play#1 1 77 "paratroopers\\040destroyed\\040in\\040failed\\040air-assault\\040on\\040%s" "loses\\040parachutists\\040in\\040failed\\040air-assault\\040of\\040%s" 4 2