Mercurial > parpg-source
changeset 139:dd7655eee67d
Added a "model" value to the dialogues game_state, which stores the GameModel.
| author | KarstenBock@gmx.net |
|---|---|
| date | Sun, 09 Oct 2011 14:38:54 +0200 |
| parents | 90ad38b00f13 |
| children | b46afa76d2ef |
| files | gui/dialoguegui.py |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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,