Mercurial > parpg-core
comparison src/parpg/objects/action.py @ 39:8b3890f17f94
FifeManager no longer subclasses ApplicationBase
PARPGApplication stores an instance of tbe manager instead
author | KarstenBock@gmx.net |
---|---|
date | Wed, 03 Aug 2011 22:57:52 +0200 |
parents | 94cb5843dcbb |
children | ad75fa042b99 |
comparison
equal
deleted
inserted
replaced
38:bd1e3b743518 | 39:8b3890f17f94 |
---|---|
313 if self.npc.dialogue is not None: | 313 if self.npc.dialogue is not None: |
314 dialogue_controller = DialogueController(self.controller.engine, | 314 dialogue_controller = DialogueController(self.controller.engine, |
315 self.view, | 315 self.view, |
316 self.model, | 316 self.model, |
317 self.controller.application) | 317 self.controller.application) |
318 self.controller.application.push_mode(dialogue_controller) | 318 self.controller.application.manager.push_mode(dialogue_controller) |
319 dialogue_controller.startTalk(self.npc) | 319 dialogue_controller.startTalk(self.npc) |
320 else: | 320 else: |
321 self.npc.behaviour.agent.say("Leave me alone!", 1000) | 321 self.npc.behaviour.agent.say("Leave me alone!", 1000) |
322 | 322 |
323 self.model.game_state.player_character.behaviour.idle() | 323 self.model.game_state.player_character.behaviour.idle() |