Skip to content

Commit 71b42d7

Browse files
stm2ennorehling
authored andcommitted
1 parent af3756a commit 71b42d7

File tree

7 files changed

+384
-354
lines changed

7 files changed

+384
-354
lines changed

e2/en/messages.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ MISSINGNUMRECRUITS, Number of recruits missing
7171
MISSINGOFFER, Missing offer
7272
MISSINGPARAMETERS, LEVEL or REGION missing
7373
MISSINGPASSWORD, Missing password
74+
MISSINGSTART, ERESSEA faction-no "Password" not found
7475
MISSINGUNITNUMBER, Missing unit number
7576
MOVENOTPOSSIBLEWITHPAUSE, MOVE and PAUSE cannot be combined
7677
MSGTO, MESSAGE TO FACTION, MESSAGE TO UNIT or MESSAGE TO REGION

e3/de/messages.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ MISSINGNEXT, NÄCHSTER fehlt
8989
MISSINGNUMRECRUITS, Anzahl Rekruten fehlt
9090
MISSINGOFFER, Geldgebot fehlt
9191
MISSINGPASSWORD, Kein Passwort angeben
92+
MISSINGSTART, ERESSEA partei-nummer "Passwort" fehlt
9293
MISSINGUNITNUMBER, Keine Einheitsnummer
9394
NAMECONTAINSBRACKETS, Namen dürfen keine Klammern enthalten
9495
NEEDBOTHCOORDINATES, Beide Koordinaten müssen angegeben werden

e3/en/messages.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ MISSINGNUMRECRUITS, Number of recruits missing
8989
MISSINGOFFER, Missing offer
9090
MISSINGPARAMETERS, LEVEL or REGION missing
9191
MISSINGPASSWORD, Missing password
92+
MISSINGSTART, ERESSEA faction-no "Password" not found
9293
MISSINGUNITNUMBER, Missing unit number
9394
MOVENOTPOSSIBLEWITHPAUSE, MOVE and PAUSE cannot be combined
9495
NAMECONTAINSBRACKETS, Names must not contain brackets

echeck.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4924,7 +4924,7 @@ void check_OPTION(void)
49244924

49254925
void process_order_file(int *faction_count, int *unit_count)
49264926
{
4927-
int f = 0, next = 0;
4927+
int f = 0, next = 0, start_warning = 1;
49284928
t_region *r;
49294929
teach *t;
49304930
unit *u;
@@ -5066,6 +5066,7 @@ void process_order_file(int *faction_count, int *unit_count)
50665066
indent = next_indent = INDENT_FACTION;
50675067
porder();
50685068
next = 1;
5069+
start_warning = 1;
50695070

50705071
check_money(true); /* Check für Lerngeld, Handel usw.; true: dann Bewegung ausführen */
50715072
if (Regionen) {
@@ -5100,12 +5101,20 @@ void process_order_file(int *faction_count, int *unit_count)
51005101
cmd_unit = NULL;
51015102
order_unit = NULL;
51025103

5104+
get_order();
5105+
break;
5106+
51035107
default:
51045108
if (order_buf[0] == ';') {
51055109
check_comment();
51065110
} else {
5107-
if (f && order_buf[0])
5111+
if (f && order_buf[0]) {
51085112
awarning(_("Not carried out by any unit"), 1);
5113+
}
5114+
else if (start_warning && order_buf[0]) {
5115+
anerror(_("ERESSEA faction-no \"Password\" not found"));
5116+
start_warning = 0;
5117+
}
51095118
}
51105119
get_order();
51115120
}

0 commit comments

Comments
 (0)