Ignore:
Timestamp:
08/07/10 20:01:34 (9 years ago)
Author:
beliar
Message:

Ticket #139: Patch by Beliar.

  • Initiating a dialogue will now pause the game and no other interaction with the world is possible.
  • Opening the pause menu will now pause the game
  • Opening the save or load window will now pause the game

fixes[s:trac, t:139]

Location:
trunk/game/scripts/objects
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/game/scripts/objects/action.py

    r618 r632  
    283283        """Talk with the NPC when close enough, otherwise move closer. 
    284284           @return: None""" 
    285        
     285        from scripts.dialoguecontroller import DialogueController 
     286         
    286287        player_char = self.model.game_state.player_character 
    287288        npc_coordinates = self.npc.getLocation().getLayerCoordinates() 
     
    306307     
    307308            if self.npc.dialogue is not None: 
    308                 self.npc.talk(player_char) 
    309                 self.view.hud.showDialogue(self.npc) 
     309                dialogue_controller = DialogueController(self.controller.engine, 
     310                                                         self.view, 
     311                                                         self.model, 
     312                                                         self.controller.application) 
     313                self.controller.application.pushController(dialogue_controller) 
     314                dialogue_controller.startTalk(self.npc) 
    310315            else: 
    311316                self.npc.behaviour.agent.say("Leave me alone!", 1000) 
  • trunk/game/scripts/objects/composed.py

    r615 r632  
    6363        if state.has_key("on_map"): 
    6464            del state["on_map"] 
    65         del state["agent"] 
     65        if state.has_key("agent"): 
     66            del state["agent"] 
    6667 
    6768    def getStateForSaving(self): 
Note: See TracChangeset for help on using the changeset viewer.