forked from github/server
parent
0a756efba9
commit
d4bd2bc7f7
|
@ -2200,9 +2200,6 @@
|
|||
<string name="LERNEN">
|
||||
<text locale="de">LERNEN</text>
|
||||
</string>
|
||||
<string name="LIEFERE">
|
||||
<text locale="de">LIEFERE</text>
|
||||
</string>
|
||||
<string name="MACHEN">
|
||||
<text locale="de">MACHEN</text>
|
||||
</string>
|
||||
|
@ -6980,6 +6977,11 @@
|
|||
<text locale="en">guards the region</text>
|
||||
</string>
|
||||
|
||||
<string name="unit_hungers">
|
||||
<text locale="de">hungert</text>
|
||||
<text locale="en">hungry</text>
|
||||
</string>
|
||||
|
||||
<string name="list_and">
|
||||
<text locale="de"> und </text>
|
||||
<text locale="en"> and </text>
|
||||
|
|
|
@ -1306,7 +1306,7 @@ void economics(region * r)
|
|||
ord = NULL;
|
||||
destroyed = true;
|
||||
}
|
||||
} else if (kwd == K_GIVE || kwd == K_LIEFERE) {
|
||||
} else if (kwd == K_GIVE) {
|
||||
give_cmd(u, ord);
|
||||
} else if (kwd == K_FORGET) {
|
||||
forget_cmd(u, ord);
|
||||
|
|
|
@ -260,10 +260,6 @@ static order *create_order_i(keyword_t kwd, const char *sptr, int persistent,
|
|||
case K_KOMMENTAR:
|
||||
case NOKEYWORD:
|
||||
return NULL;
|
||||
case K_LIEFERE:
|
||||
kwd = K_GIVE;
|
||||
persistent = 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -575,7 +571,6 @@ bool is_persistent(const order * ord)
|
|||
return false;
|
||||
|
||||
case K_KOMMENTAR:
|
||||
case K_LIEFERE:
|
||||
return true;
|
||||
|
||||
default:
|
||||
|
|
|
@ -620,10 +620,12 @@ bufunit(const faction * f, const unit * u, int indent, int mode, char *buf,
|
|||
WARN_STATIC_BUFFER();
|
||||
}
|
||||
if (fval(u, UFL_HUNGER)) {
|
||||
if (c)
|
||||
bytes = (int)strlcpy(bufp, ", hungert", size);
|
||||
else
|
||||
bytes = (int)strlcpy(bufp, "hungert", size);
|
||||
if (c) {
|
||||
bytes = (int)strlcpy(bufp, ", ", size);
|
||||
if (wrptr(&bufp, &size, bytes) != 0)
|
||||
WARN_STATIC_BUFFER();
|
||||
}
|
||||
bytes = (int)strlcpy(bufp, LOC(f->locale, "unit_hungers"), size);
|
||||
if (wrptr(&bufp, &size, bytes) != 0)
|
||||
WARN_STATIC_BUFFER();
|
||||
}
|
||||
|
|
|
@ -101,7 +101,6 @@ typedef enum {
|
|||
K_CONTACT,
|
||||
K_TEACH,
|
||||
K_STUDY,
|
||||
K_LIEFERE,
|
||||
K_MAKE,
|
||||
K_MOVE,
|
||||
K_PASSWORD,
|
||||
|
|
Loading…
Reference in New Issue