[Adonthell-commits] CVS: adonthell/src/tools/dlgedit dialogue.py,1.1.2.4,1.1.2.5

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src/tools/dlgedit
In directory subversions:/tmp/cvs-serv18083/src/tools/dlgedit

Modified Files:
      Tag: Branch_road_to_0-4
        dialogue.py 
Log Message:
FIXES for autoconf 2.53 and automake 1.6


Index: dialogue.py
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/Attic/dialogue.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** dialogue.py 2 Apr 2002 17:43:29 -0000       1.1.2.4
--- dialogue.py 12 Sep 2002 20:18:16 -0000      1.1.2.5
***************
*** 33,37 ****
          self.speaker = []
          
!         # -- get the code to execute, the hint fot the dialogue engine
          #    and the list of following dialogue options
          code, stop, follow = self.dlg[index][1:]
--- 33,37 ----
          self.speaker = []
          
!         # -- get the code to execute, the hint for the dialogue engine
          #    and the list of following dialogue options
          code, stop, follow = self.dlg[index][1:]
***************
*** 56,61 ****
              # -- only append the option if the condition was met
              if result == 1:
                  self.speech.append (speech)
-                 self.speaker.append (self.dlg[speech][0])
  
          # -- finally, tell the dialogue engine what to do            
--- 56,64 ----
              # -- only append the option if the condition was met
              if result == 1:
+                 speaker = self.dlg[speech][0]
+                 if speaker == "Default": speaker = self.the_npc
+                  
+                 self.speaker.append (speaker)
                  self.speech.append (speech)
  
          # -- finally, tell the dialogue engine what to do