Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made EvMenu correctly handle being called from a ServerSession.

Browse source
This commit is contained in:
Griatch 2015-12-19 19:13:29 +01:00
parent 2427db7f9f
commit f10f4ddc98
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/utils/evmenu.py
View file

@ -194,7 +194,7 @@ class CmdEvMenuNode(Command):
Implement all menu commands. Implement all menu commands.
""" """
caller = self.caller caller = self.caller
menu = caller.ndb._menutree menu = caller.ndb._menutree or self.session.ndb._menutree
if not menu: if not menu:
err = "Menu object not found as %s.ndb._menutree!" % (caller) err = "Menu object not found as %s.ndb._menutree!" % (caller)
@ -319,7 +319,7 @@ class EvMenu(object):
Initialize the menu tree and start the caller onto the first node. Initialize the menu tree and start the caller onto the first node.
Args: Args:
caller (str): The user of the menu. caller (Object, Player or Session): The user of the menu.
menudata (str, module or dict): The full or relative path to the module menudata (str, module or dict): The full or relative path to the module
holding the menu tree data. All global functions in this module holding the menu tree data. All global functions in this module
whose name doesn't start with '_ ' will be parsed as menu nodes. whose name doesn't start with '_ ' will be parsed as menu nodes.