From 7395a772f9e9959cb10088122b4093da60f16a89 Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 12 Feb 2015 16:21:11 +0100 Subject: [PATCH 1/2] Fixed a typo in contrib/menusystem. Resolves #629. --- evennia/contrib/menusystem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/contrib/menusystem.py b/evennia/contrib/menusystem.py index 20e98a6acf..4ab99ec40d 100644 --- a/evennia/contrib/menusystem.py +++ b/evennia/contrib/menusystem.py @@ -497,7 +497,7 @@ def prompt_choice(caller, question="", prompts=None, choicefunc=None, force_choo count = 0 choices = "" commands = [] - for choice in utils.makeiter(prompts): + for choice in utils.make_iter(prompts): count += 1 choices += "\n{lc%d{lt[%d]{le %s" % (count, count, choice) From f5e99c6341f22e5e2ac876b2654b3a9a1e555551 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Thu, 12 Feb 2015 17:59:00 -0800 Subject: [PATCH 2/2] Remove redundant check in perm(). --- evennia/locks/lockfuncs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py index b3393701b2..32f5cb6e24 100644 --- a/evennia/locks/lockfuncs.py +++ b/evennia/locks/lockfuncs.py @@ -176,7 +176,7 @@ def perm(accessing_obj, accessed_obj, *args, **kwargs): else: return hpos_target <= min(hpos_player, hpos_object) elif gtmode: - return gtmode and hpos_target < hpos_player + return hpos_target < hpos_player else: return hpos_target <= hpos_player elif not is_quell and perm in perms_player: