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

Change running 'look' to just displaying the node text.

Browse source
This commit is contained in:
Ahmed Charles 2015-10-18 00:30:18 +00:00 • committed by Griatch
parent 6619949381
commit a9f2e33394
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/utils/evmenu.py
View file

@ -479,14 +479,12 @@ class EvMenu(object):
# flags and data # flags and data
caller = self._caller caller = self._caller
cmd = raw_string.strip().lower() cmd = raw_string.strip().lower()
options = self.options
allow_quit = self.allow_quit allow_quit = self.allow_quit
default = self.default
if cmd in options: if cmd in self.options:
# this will overload the other commands # this will overload the other commands
# if it has the same name! # if it has the same name!
goto, callback = options[cmd] goto, callback = self.options[cmd]
self._callback_goto(callback, goto, raw_string) self._callback_goto(callback, goto, raw_string)
elif cmd in ("look", "l"): elif cmd in ("look", "l"):
self._display_nodetext() self._display_nodetext()
@ -494,13 +492,13 @@ class EvMenu(object):
self._display_helptext() self._display_helptext()
elif allow_quit and cmd in ("quit", "q", "exit"): elif allow_quit and cmd in ("quit", "q", "exit"):
self.close_menu() self.close_menu()
elif default: elif self.default:
goto, callback = default goto, callback = self.default
self._callback_goto(callback, goto, raw_string) self._callback_goto(callback, goto, raw_string)
else: else:
caller.msg(_HELP_NO_OPTION_MATCH) caller.msg(_HELP_NO_OPTION_MATCH)
if not (options or default): if not (self.options or self.default):
# no options - we are at the end of the menu. # no options - we are at the end of the menu.
self.close_menu() self.close_menu()
@ -599,7 +597,7 @@ class EvMenu(object):
else: else:
self.helptext = _HELP_NO_OPTIONS if self.allow_quit else _HELP_NO_OPTIONS_NO_QUIT self.helptext = _HELP_NO_OPTIONS if self.allow_quit else _HELP_NO_OPTIONS_NO_QUIT
self._caller.execute_cmd("look") self._display_nodetext()
def close_menu(self): def close_menu(self):
""" """