Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Die Einheit hat diesen Gegenstand zwar, aber sämtliche $int($reservation) $resource($resource,$reservation) sind reserviert.

This commit is contained in:
Enno Rehling 2007-05-15 20:11:25 +00:00
parent 08d10d8588
commit 425a1eb390
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/kernel/give.c
View File

@ -100,11 +100,17 @@ give_item(int want, const item_type * itype, unit * src, unit * dest, struct ord
n = min(want, n); n = min(want, n);
if (dest && src->faction != dest->faction && src->faction->age < GiveRestriction()) { if (dest && src->faction != dest->faction && src->faction->age < GiveRestriction()) {
if (ord!=NULL) { if (ord!=NULL) {
ADDMSG(&src->faction->msgs, msg_feedback(src, ord, "giverestriction", ADDMSG(&src->faction->msgs, msg_feedback(src, ord, "giverestriction",
"turns", GiveRestriction())); "turns", GiveRestriction()));
} }
return -1; return -1;
} else if (n == 0) { } else if (n == 0) {
int reserve = get_reservation(src, itype->rtype);
if (reserve) {
msg_feedback(src, ord, "nogive_reserved", "resource reservation",
itype->rtype, reserve);
return -1;
}
error = 36; error = 36;
} else if (itype->flags & ITF_CURSED) { } else if (itype->flags & ITF_CURSED) {
error = 25; error = 25;
@ -132,7 +138,7 @@ give_item(int want, const item_type * itype, unit * src, unit * dest, struct ord
/* warden_add_give(src, dest, itype, n); */ /* warden_add_give(src, dest, itype, n); */
} }
#endif #endif
}else{ } else {
/* gib bauern */ /* gib bauern */
give_peasants(use, itype, src); give_peasants(use, itype, src);
} }

11
src/res/messages.xml
View File

@ -5952,6 +5952,17 @@
<text locale="fr">"$unit($unit) en $region($region): '$order($command)' - L'unité ne possède pas cet objet."</text> <text locale="fr">"$unit($unit) en $region($region): '$order($command)' - L'unité ne possède pas cet objet."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - The unit does not have this item."</text> <text locale="en">"$unit($unit) in $region($region): '$order($command)' - The unit does not have this item."</text>
</message> </message>
<message name="nogive_reserved" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
<arg name="reservation" type="int"/>
<arg name="resource" type="resource"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Die Einheit hat diesen Gegenstand zwar, aber sämtliche $int($reservation) $resource($resource,$reservation) sind reserviert."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - The unit has this item, but all $int($reservation) $resource($resource,$reservation) are reserved."</text>
</message>
<message name="error35" section="errors"> <message name="error35" section="errors">
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>