Ver código fonte

*** empty log message ***

Mike Goslin 25 anos atrás
pai
commit
63c7d213e2
2 arquivos alterados com 10 adições e 11 exclusões
  1. 2 1
      direct/src/fsm/StateData.py
  2. 8 10
      direct/src/gui/ForceAcknowledge.py

+ 2 - 1
direct/src/fsm/StateData.py

@@ -7,10 +7,11 @@ class StateData(DirectObject):
 
 
     """StateData class: """
     """StateData class: """
 
 
-    def __init__(self, doneEvent)
+    def __init__(self, doneEvent):
         """__init__(self, Event)
         """__init__(self, Event)
         """
         """
 	self.doneEvent = doneEvent
 	self.doneEvent = doneEvent
+	self.isLoaded = 0
 
 
     def enter(self):
     def enter(self):
         """enter(self)"""
         """enter(self)"""

+ 8 - 10
direct/src/gui/ForceAcknowledge.py

@@ -1,27 +1,25 @@
 import string
 import string
 import OnscreenText
 import OnscreenText
 import Button
 import Button
+import StateData
 
 
 from DirectObject import *
 from DirectObject import *
-from StateData import *
 
 
-class ForceAcknowledge(StateData):
+class ForceAcknowledge(StateData.StateData):
 
 
     def __init__(self, doneEvent, message):
     def __init__(self, doneEvent, message):
-	"""___init___(self, Event, string)"""
-	self.isLoaded = 0
-	self.doneEvent = doneEvent
-	self.message = message
+	"""___init___(self, Event)"""
+	StateData.__init__(doneEvent)
 	self.soundRollover = None
 	self.soundRollover = None
 	self.soundOk = None
 	self.soundOk = None
 
 
-    def enter(self):
-	"""enter(self)"""
+    def enter(self, message):
+	"""enter(self, string)"""
 	if self.isLoaded == 0:
 	if self.isLoaded == 0:
 	    self.load()
 	    self.load()
 
 
 	if self.text:
 	if self.text:
-	    self.text.setText(self.message)
+	    self.text.setText(message)
 	    self.text.reparentTo(render2d)
 	    self.text.reparentTo(render2d)
 
 
 	if self.okButton:
 	if self.okButton:
@@ -68,5 +66,5 @@ class ForceAcknowledge(StateData):
     def __handleRollover(self):
     def __handleRollover(self):
 	return None
 	return None
 
 
-    def __handleOk
+    def __handleOk(self):
 	messenger.send(self.doneEvent, [0])
 	messenger.send(self.doneEvent, [0])