Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-21 23:36:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-1' of https://github.com/ahmedcharles/evennia into ahmedcharles-patch-1

Browse source
This commit is contained in:
Griatch 2015-02-13 07:38:36 +01:00
commit 834ec3010d
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/menusystem.py
View file

@ -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)

2
evennia/locks/lockfuncs.py
View file

@ -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: