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

a little more precision on the "cannot move" error messages. again.

This commit is contained in:
Enno Rehling 2006-04-16 10:50:24 +00:00
parent 85efcd6511
commit b74a0b6b50
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/movement.c
View File

@ -2242,7 +2242,7 @@ hunt(unit *u, order * ord)
fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */ fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */
return 0; return 0;
} else if (fval(u, UFL_NOTMOVING)) { } else if (fval(u, UFL_NOTMOVING)) {
cmistake(u, ord, 187, MSG_MOVE); cmistake(u, ord, 319, MSG_MOVE);
fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */ fset(u, UFL_LONGACTION); /* FOLGE SCHIFF ist immer lang */
return 0; return 0;
} else if (!can_move(u)) { } else if (!can_move(u)) {
@ -2437,13 +2437,19 @@ movement(void)
* UFL_NOTMOVING is set in combat if the unit is not allowed * UFL_NOTMOVING is set in combat if the unit is not allowed
* to move because it was involved in a battle. * to move because it was involved in a battle.
*/ */
if (fval(u, UFL_LONGACTION|UFL_MOVED|UFL_NOTMOVING)) { if (fval(u, UFL_LONGACTION)) {
cmistake(u, u->thisorder, 52, MSG_MOVE);
set_order(&u->thisorder, NULL);
} else if (fval(u, UFL_NOTMOVING)) {
cmistake(u, u->thisorder, 319, MSG_MOVE);
set_order(&u->thisorder, NULL);
} else if (fval(u, UFL_MOVED)) {
cmistake(u, u->thisorder, 187, MSG_MOVE); cmistake(u, u->thisorder, 187, MSG_MOVE);
set_order(&u->thisorder, NULL); set_order(&u->thisorder, NULL);
} else if (!can_move(u)) { } else if (!can_move(u)) {
cmistake(u, u->thisorder, 55, MSG_MOVE); cmistake(u, u->thisorder, 55, MSG_MOVE);
set_order(&u->thisorder, NULL); set_order(&u->thisorder, NULL);
} else if (!fval(u, UFL_MOVED|UFL_NOTMOVING)) { } else {
if (ships) { if (ships) {
if (u->ship && fval(u, UFL_OWNER)) { if (u->ship && fval(u, UFL_OWNER)) {
init_tokens(u->thisorder); init_tokens(u->thisorder);

11
src/res/messages.xml
View File

@ -2758,6 +2758,17 @@
<text locale="en">"$unit($unit) drowns when $ship($ship) in $region($region) sinks."</text> <text locale="en">"$unit($unit) drowns when $ship($ship) in $region($region) sinks."</text>
</message> </message>
<message name="error319" section="errors">
<type>
<arg name="unit" type="unit"/>
<arg name="region" type="region"/>
<arg name="command" type="order"/>
</type>
<text locale="de">"$unit($unit) in $region($region): '$order($command)' - Die Einheit kann den Befehl in dieser Runde nicht ausführen, da sie an einem Kampf teilgenommen hat."</text>
<text locale="fr">"$unit($unit) in $region($region): '$order($command)' - The unit cannot execute this command because it has been in combat."</text>
<text locale="en">"$unit($unit) in $region($region): '$order($command)' - The unit cannot execute this command because it has been in combat."</text>
</message>
<message name="error318" section="events"> <message name="error318" section="events">
<type> <type>
<arg name="unit" type="unit"/> <arg name="unit" type="unit"/>