Mercurial > parpg-source

comparison objects/action.py @ 17:7b31de1dc964

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 708a6f651c31
children 98f26f7636d8
comparison
equal deleted inserted replaced
16:5c587a0d9ad7 17:7b31de1dc964
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()