Skip to content

Commit 417a5e9

Browse files
committed
This reverts commit 71b42d7.
1 parent 4cba246 commit 417a5e9

File tree

7 files changed

+356
-384
lines changed

7 files changed

+356
-384
lines changed

e2/en/messages.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ 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
7574
MISSINGUNITNUMBER, Missing unit number
7675
MOVENOTPOSSIBLEWITHPAUSE, MOVE and PAUSE cannot be combined
7776
MSGTO, MESSAGE TO FACTION, MESSAGE TO UNIT or MESSAGE TO REGION

e3/de/messages.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ 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
9392
MISSINGUNITNUMBER, Keine Einheitsnummer
9493
NAMECONTAINSBRACKETS, Namen dürfen keine Klammern enthalten
9594
NEEDBOTHCOORDINATES, Beide Koordinaten müssen angegeben werden

e3/en/messages.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ 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
9392
MISSINGUNITNUMBER, Missing unit number
9493
MOVENOTPOSSIBLEWITHPAUSE, MOVE and PAUSE cannot be combined
9594
NAMECONTAINSBRACKETS, Names must not contain brackets

echeck.c

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

49904990
void process_order_file(int *faction_count, int *unit_count)
49914991
{
4992-
int f = 0, next = 0, start_warning = 1;
4992+
int f = 0, next = 0;
49934993
t_region *r;
49944994
teach *t;
49954995
unit *u;
@@ -5133,7 +5133,6 @@ void process_order_file(int *faction_count, int *unit_count)
51335133
indent = next_indent = INDENT_FACTION;
51345134
porder();
51355135
next = 1;
5136-
start_warning = 1;
51375136

51385137
check_money(true); /* Check für Lerngeld, Handel usw.; true: dann Bewegung ausführen */
51395138
if (Regionen) {
@@ -5168,20 +5167,12 @@ void process_order_file(int *faction_count, int *unit_count)
51685167
cmd_unit = NULL;
51695168
order_unit = NULL;
51705169

5171-
get_order();
5172-
break;
5173-
51745170
default:
51755171
if (order_buf[0] == ';') {
51765172
check_comment();
51775173
} else {
5178-
if (f && order_buf[0]) {
5174+
if (f && order_buf[0])
51795175
awarning(_("Not carried out by any unit"), 1);
5180-
}
5181-
else if (start_warning && order_buf[0]) {
5182-
anerror(_("ERESSEA faction-no \"Password\" not found"));
5183-
start_warning = 0;
5184-
}
51855176
}
51865177
get_order();
51875178
}

0 commit comments

Comments
 (0)