# HG changeset patch # User KarstenBock@gmx.net # Date 1318163934 -7200 # Node ID dd7655eee67d61b139d2107191a9e272cc0f9d41 # Parent 90ad38b00f1396180da0737eccbdba0d4b845ac2 Added a "model" value to the dialogues game_state, which stores the GameModel. diff -r 90ad38b00f13 -r dd7655eee67d gui/dialoguegui.py --- a/gui/dialoguegui.py Sun Oct 09 14:29:02 2011 +0200 +++ b/gui/dialoguegui.py Sun Oct 09 14:38:54 2011 +0200 @@ -27,7 +27,8 @@ """Window that handles the dialogues.""" _logger = logging.getLogger('dialoguegui.DialogueGUI') - def __init__(self, controller, npc, quest_engine, met_fnc, meet_fnc, has_fnc, player_character): + def __init__(self, controller, npc, quest_engine, met_fnc, meet_fnc, + has_fnc, player_character): self.active = False self.controller = controller xml_file = vfs.VFS.open('gui/dialogue.xml') @@ -62,6 +63,7 @@ 'quest': self.quest_engine, 'met': self.met_fnc, 'meet': self.meet_fnc, 'pc_has': self.pc_has_fnc, 'npc_has': self.npc_has_fnc, + 'model': self.controller.model, } try: self.dialogue_processor = DialogueProcessor(self.npc.dialogue.dialogue,