forked from github/server
FOLGEN SCHIFF ist kein langer Befehl
This commit is contained in:
parent
c45e89de45
commit
068efb08f3
|
@ -744,13 +744,13 @@ caught_target(region * r, unit * u)
|
||||||
unit * target = (unit*)a->data.v;
|
unit * target = (unit*)a->data.v;
|
||||||
|
|
||||||
if (!present(r, target)) {
|
if (!present(r, target)) {
|
||||||
add_message(&u->faction->msgs, new_message(u->faction,
|
ADDMSG(&u->faction->msgs, msg_message("followfail", "unit follower",
|
||||||
"followfail%u:unit%u:follower", target, u));
|
target, u));
|
||||||
} else if (!alliedunit(target, u->faction, HELP_ALL)
|
} else if (!alliedunit(target, u->faction, HELP_ALL)
|
||||||
&& cansee(target->faction, r, u, 0))
|
&& cansee(target->faction, r, u, 0))
|
||||||
{
|
{
|
||||||
add_message(&target->faction->msgs, new_message(target->faction,
|
ADDMSG(&target->faction->msgs, msg_message("followdetect",
|
||||||
"followdetect%u:unit%u:follower", target, u));
|
"unit follower", target, u));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2030,7 +2030,9 @@ hunt(unit *u)
|
||||||
char command[256];
|
char command[256];
|
||||||
direction_t dir;
|
direction_t dir;
|
||||||
|
|
||||||
if(!u->ship) {
|
if (fval(u, UFL_LONGACTION)) {
|
||||||
|
return 0;
|
||||||
|
} else if (u->ship==NULL) {
|
||||||
cmistake(u, u->thisorder, 144, MSG_MOVE);
|
cmistake(u, u->thisorder, 144, MSG_MOVE);
|
||||||
return 0;
|
return 0;
|
||||||
} else if(!fval(u, UFL_OWNER)) {
|
} else if(!fval(u, UFL_OWNER)) {
|
||||||
|
|
Loading…
Reference in New Issue