changed the handling of an item the unit has no access to

Since the return of display_item() implies that the item, which is
definitely an item but not a potion at this point, is neither in the
inventory of the unit nor an item in the region or the faction's item
pool, the existing message 36 is now triggered in this case and the
previously conditional break is now done indepent of the outcome of
display_item, which shouldn't be critical (it's  an item so it can't be
a spell or a race).
This commit is contained in:
Philipp Dreher 2015-11-04 23:48:30 +01:00
parent 7e81b98fa4
commit d5f8448d7d
1 changed files with 4 additions and 2 deletions

View File

@ -2461,8 +2461,10 @@ static void reshow(unit * u, struct order *ord, const char *s, param_t p)
break;
}
else {
if (display_item(u->faction, u, itype))
break;
if (!display_item(u->faction, u, itype))
cmistake(u, ord, 36, MSG_EVENT);
break;
}
}
/* try for a spell */