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

inconsistent error-numbering

This commit is contained in:
Enno Rehling 2007-02-10 21:35:19 +00:00
parent 7494c64082
commit 5c75304747
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,7 @@ give_men(int n, unit * u, unit * u2, struct order * ord)
} else if (fval(u, UFL_LOCKED) || is_cursed(u->attribs, C_SLAVE, 0)) { } else if (fval(u, UFL_LOCKED) || is_cursed(u->attribs, C_SLAVE, 0)) {
error = 74; error = 74;
} else if (u2 && fval(u, UFL_HUNGER)) { } else if (u2 && fval(u, UFL_HUNGER)) {
error = 320; error = 73;
} else if (u2 && (fval(u2, UFL_LOCKED)|| is_cursed(u2->attribs, C_SLAVE, 0))) { } else if (u2 && (fval(u2, UFL_LOCKED)|| is_cursed(u2->attribs, C_SLAVE, 0))) {
error = 75; error = 75;
} else if (u2 && u2->faction != u->faction && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) { } else if (u2 && u2->faction != u->faction && !alliedunit(u2, u->faction, HELP_GIVE) && !ucontact(u2, u)) {

2
src/res/messages.xml
View File

@ -5173,7 +5173,7 @@
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text> <text locale="fr">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text> <text locale="en">"$unit($unit) in $region($region): '$order($command)' - This unit does not take anybody."</text>
</message> </message>
<message name="error742" section="errors"> <message name="error73" section="errors">
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>
<arg name="region" type="region"/> <arg name="region" type="region"/>