From d5f8448d7d14d6bcd2d252c40af814768407a93e Mon Sep 17 00:00:00 2001 From: Philipp Dreher Date: Wed, 4 Nov 2015 23:48:30 +0100 Subject: [PATCH] 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). --- src/laws.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/laws.c b/src/laws.c index 3b4cc6fca..58f569adb 100755 --- a/src/laws.c +++ b/src/laws.c @@ -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 */