Browse Source

*** empty log message ***

Joe Shochet 25 years ago
parent
commit
5496f3fe93

+ 4 - 0
direct/src/fsm/State.py

@@ -55,6 +55,10 @@ class State(DirectObject):
         """setTransitions(self, string[])"""
         """setTransitions(self, string[])"""
         self.__transitions = stateTransitions
         self.__transitions = stateTransitions
 
 
+    def addTransition(self, transition):
+        """addTransitions(self, string)"""
+        self.__transitions.append(transition)
+
     def getInspectorPos(self):
     def getInspectorPos(self):
         """getInspectorPos(self)"""
         """getInspectorPos(self)"""
         return(self.__inspectorPos)
         return(self.__inspectorPos)

+ 3 - 3
direct/src/leveleditor/LevelEditor.py

@@ -126,9 +126,9 @@ except NameError:
     loadDNAFile(DNASTORE, 'phase_4/dna/storage.dna', CSDefault, 1)
     loadDNAFile(DNASTORE, 'phase_4/dna/storage.dna', CSDefault, 1)
     # Load all the neighborhood specific storage files
     # Load all the neighborhood specific storage files
     loadDNAFile(DNASTORE, 'phase_4/dna/storage_TT.dna', CSDefault, 1)
     loadDNAFile(DNASTORE, 'phase_4/dna/storage_TT.dna', CSDefault, 1)
-    #loadDNAFile(DNASTORE, 'phase_6/dna/storage_DD.dna', CSDefault, 1)
-    #loadDNAFile(DNASTORE, 'phase_6/dna/storage_MM.dna', CSDefault, 1)
-    #loadDNAFile(DNASTORE, 'phase_6/dna/storage_BR.dna', CSDefault, 1)
+    loadDNAFile(DNASTORE, 'phase_6/dna/storage_DD.dna', CSDefault, 1)
+    loadDNAFile(DNASTORE, 'phase_6/dna/storage_MM.dna', CSDefault, 1)
+    loadDNAFile(DNASTORE, 'phase_6/dna/storage_BR.dna', CSDefault, 1)
     __builtin__.dnaLoaded = 1
     __builtin__.dnaLoaded = 1
 
 
 # Precompute class types for type comparisons
 # Precompute class types for type comparisons

+ 3 - 0
direct/src/showbase/Loader.py

@@ -8,6 +8,7 @@ class Loader:
     """Loader class: contains method to load models, sounds and code"""
     """Loader class: contains method to load models, sounds and code"""
 
 
     notify = directNotify.newCategory("Loader")
     notify = directNotify.newCategory("Loader")
+    notify.setVerbose(1)
     
     
     # special methods
     # special methods
     def __init__(self, base):
     def __init__(self, base):
@@ -91,6 +92,7 @@ class Loader:
     def unloadTexture(self, texture):
     def unloadTexture(self, texture):
 	"""unloadTexture(self, texture)
 	"""unloadTexture(self, texture)
 	"""
 	"""
+        Loader.notify.info("Unloading texture: %s" % (texture) )
 	TexturePool.releaseTexture(texture)
 	TexturePool.releaseTexture(texture)
 
 
     # sound loading funcs
     # sound loading funcs
@@ -105,6 +107,7 @@ class Loader:
     def unloadSound(self, sound):
     def unloadSound(self, sound):
 	"""unloadSound(self, sound)
 	"""unloadSound(self, sound)
 	"""
 	"""
+        Loader.notify.info("Unloading sound: %s" % (sound) )
 	AudioPool.releaseSound(sound)
 	AudioPool.releaseSound(sound)