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

simplicate and add more lightness

Browse source
This commit is contained in:
Enno Rehling 2021-01-16 22:11:33 +01:00
parent 88e0af287e
commit d03face3c1
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/move.c
View file

@ -892,11 +892,6 @@ static void drifting_ships(region * r)
} }
} }
static bool present(region * r, unit * u)
{
return (u && u->region == r);
}
static void caught_target_ship(region* r, unit* u) static void caught_target_ship(region* r, unit* u)
{ {
attrib* a = a_find(u->attribs, &at_follow); attrib* a = a_find(u->attribs, &at_follow);
@ -908,7 +903,7 @@ static void caught_target_ship(region* r, unit* u)
if (a) { if (a) {
unit* target = (unit*)a->data.v; unit* target = (unit*)a->data.v;
if (target == u || !present(r, target)) { if (target == u || r != target->region) {
ADDMSG(&u->faction->msgs, msg_message("followfail_ship", ADDMSG(&u->faction->msgs, msg_message("followfail_ship",
"ship follower", target->ship, u->ship)); "ship follower", target->ship, u->ship));
} }
@ -931,7 +926,7 @@ static void caught_target(region * r, unit * u)
if (a) { if (a) {
unit *target = (unit *)a->data.v; unit *target = (unit *)a->data.v;
if (target == u || !present(r, target)) { if (target == u || r != target->region) {
ADDMSG(&u->faction->msgs, msg_message("followfail", "unit follower", ADDMSG(&u->faction->msgs, msg_message("followfail", "unit follower",
target, u)); target, u));
} }