[Adonthell-commits] CVS: wastesedge/scripts/actions talk.py,1.7,1.8

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/wastesedge/scripts/actions
In directory subversions:/tmp/cvs-serv32617/actions

Modified Files:
        talk.py 
Log Message:
FIXED extro

Index: talk.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/actions/talk.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** talk.py     21 Aug 2002 15:34:50 -0000      1.7
--- talk.py     27 Jan 2003 19:53:40 -0000      1.8
***************
*** 1,4 ****
  #
! #  (C) Copyright 2001 Kai Sterker <address@hidden>
  #  Part of the Adonthell Project http://adonthell.linuxgames.com
  #
--- 1,6 ----
  #
! #  $Id$
! #
! #  (C) Copyright 2001/2003 Kai Sterker <address@hidden>
  #  Part of the Adonthell Project http://adonthell.linuxgames.com
  #
***************
*** 11,15 ****
  #
  
! # -- Map Character Action Event to launch a dialogue with the requester.
  
  
--- 13,17 ----
  #
  
! # -- mapcharacter Action Event to launch a dialogue with the requester.
  
  
***************
*** 24,30 ****
          # -- activate the characters' schedules
          # player isn't event-driven yet
!         args[0].set_schedule_active (1)
!         args[0].resume ()
!         args[1].resume ()
  
          adonthell.gamedata_engine ().set_control_active (1)
--- 26,32 ----
          # -- activate the characters' schedules
          # player isn't event-driven yet
!         args[2].set_schedule_active (1)
!         if not args[0]: args[2].resume ()
!         if not args[1]: args[3].resume ()
  
          adonthell.gamedata_engine ().set_control_active (1)
***************
*** 32,35 ****
--- 34,41 ----
      def run (self, requester):
          if requester.get_name() == adonthell.gamedata_player ().get_name():
+             # -- get characters' current state
+             player_state = requester.is_paused ()
+             npc_state = self.myself.is_paused ()
+             
              # -- deactivate the schedule of the characters involved
              self.myself.pause ()
***************
*** 51,55 ****
  
              # -- attach the callback
!             dlg.py_signal_connect (self.restore_schedule, 
adonthell.win_event_CLOSE, (requester, self.myself))
  
              # -- add the dialogue window to the win_manager
--- 57,61 ----
  
              # -- attach the callback
!             dlg.py_signal_connect (self.restore_schedule, 
adonthell.win_event_CLOSE, (player_state, npc_state, requester, self.myself))
  
              # -- add the dialogue window to the win_manager