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

Fix contribs for menu and line editor.

Browse source
This commit is contained in:
Jonathan Piacenti 2015-02-21 23:23:46 -06:00
parent 5e2cc8140a
commit 72cb4cb618
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/lineeditor.py
View file

@ -26,7 +26,7 @@ module. To use it just import and add it to your default cmdset.
import re import re
from evennia import Command, CmdSet, utils from evennia import Command, CmdSet, utils
from evennia import syscmdkeys from evennia import syscmdkeys
from contrib.menusystem import prompt_yesno from evennia.contrib.menusystem import prompt_yesno
CMD_NOMATCH = syscmdkeys.CMD_NOMATCH CMD_NOMATCH = syscmdkeys.CMD_NOMATCH
CMD_NOINPUT = syscmdkeys.CMD_NOINPUT CMD_NOINPUT = syscmdkeys.CMD_NOINPUT

12
evennia/contrib/menusystem.py
View file

@ -28,7 +28,7 @@ from evennia import Command, CmdSet, utils
from evennia import default_cmds, logger from evennia import default_cmds, logger
# imported only to make it available during execution of code blocks # imported only to make it available during execution of code blocks
import ev import evennia
CMD_NOMATCH = syscmdkeys.CMD_NOMATCH CMD_NOMATCH = syscmdkeys.CMD_NOMATCH
CMD_NOINPUT = syscmdkeys.CMD_NOINPUT CMD_NOINPUT = syscmdkeys.CMD_NOINPUT
@ -61,7 +61,7 @@ class CmdMenuNode(Command):
except Exception, e: except Exception, e:
self.caller.msg("%s\n{rThere was an error with this selection.{n" % e) self.caller.msg("%s\n{rThere was an error with this selection.{n" % e)
elif self.code: elif self.code:
ev.logger.log_depmsg("menusystem.code is deprecated. Use menusystem.func.") evennia.logger.log_depmsg("menusystem.code is deprecated. Use menusystem.func.")
try: try:
exec(self.code) exec(self.code)
except Exception, e: except Exception, e:
@ -224,7 +224,7 @@ class MenuTree(object):
self.caller.msg("{rNode callback could not be executed for node %s. Continuing anyway.{n" % key) self.caller.msg("{rNode callback could not be executed for node %s. Continuing anyway.{n" % key)
if node.code: if node.code:
# Execute eventual code active on this node. self.caller is available at this point. # Execute eventual code active on this node. self.caller is available at this point.
ev.logger.log_depmsg("menusystem.code is deprecated. Use menusystem.callback.") evennia.logger.log_depmsg("menusystem.code is deprecated. Use menusystem.callback.")
try: try:
exec(node.code) exec(node.code)
except Exception: except Exception:
@ -303,7 +303,7 @@ class MenuNode(object):
Nlinks = len(self.links) Nlinks = len(self.links)
if code: if code:
ev.logger.log_depmsg("menusystem.code is deprecated. Use menusystem.callback.") evennia.logger.log_depmsg("menusystem.code is deprecated. Use menusystem.callback.")
# validate the input # validate the input
if not self.links: if not self.links:
@ -443,10 +443,10 @@ def prompt_yesno(caller, question="", yesfunc=None, nofunc=None, yescode="", noc
# code exec is deprecated: # code exec is deprecated:
if yescode: if yescode:
ev.logger.log_depmsg("yesnosystem.code is deprecated. Use yesnosystem.callback.") evennia.logger.log_depmsg("yesnosystem.code is deprecated. Use yesnosystem.callback.")
cmdyes.code = yescode + "\nself.caller.cmdset.delete('menucmdset')\ndel self.caller.db._menu_data" cmdyes.code = yescode + "\nself.caller.cmdset.delete('menucmdset')\ndel self.caller.db._menu_data"
if nocode: if nocode:
ev.logger.log_depmsg("yesnosystem.code is deprecated. Use yesnosystem.callback.") evennia.logger.log_depmsg("yesnosystem.code is deprecated. Use yesnosystem.callback.")
cmdno.code = nocode + "\nself.caller.cmdset.delete('menucmdset')\ndel self.caller.db._menu_data" cmdno.code = nocode + "\nself.caller.cmdset.delete('menucmdset')\ndel self.caller.db._menu_data"
# creating cmdset (this will already have look/help commands) # creating cmdset (this will already have look/help commands)