diff --git a/direct/src/fsm/StateData.py b/direct/src/fsm/StateData.py index c883a0007e..f060fb9484 100644 --- a/direct/src/fsm/StateData.py +++ b/direct/src/fsm/StateData.py @@ -7,10 +7,11 @@ class StateData(DirectObject): """StateData class: """ - def __init__(self, doneEvent) + def __init__(self, doneEvent): """__init__(self, Event) """ self.doneEvent = doneEvent + self.isLoaded = 0 def enter(self): """enter(self)""" diff --git a/direct/src/gui/ForceAcknowledge.py b/direct/src/gui/ForceAcknowledge.py index 42379046b7..1e052ecfcf 100644 --- a/direct/src/gui/ForceAcknowledge.py +++ b/direct/src/gui/ForceAcknowledge.py @@ -1,27 +1,25 @@ import string import OnscreenText import Button +import StateData from DirectObject import * -from StateData import * -class ForceAcknowledge(StateData): +class ForceAcknowledge(StateData.StateData): 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.soundOk = None - def enter(self): - """enter(self)""" + def enter(self, message): + """enter(self, string)""" if self.isLoaded == 0: self.load() if self.text: - self.text.setText(self.message) + self.text.setText(message) self.text.reparentTo(render2d) if self.okButton: @@ -68,5 +66,5 @@ class ForceAcknowledge(StateData): def __handleRollover(self): return None - def __handleOk + def __handleOk(self): messenger.send(self.doneEvent, [0])