Browse Source

warning on duplicate zoneNode

Darren Ranalli 22 years ago
parent
commit
484fec162c
2 changed files with 4 additions and 2 deletions
  1. 3 1
      direct/src/level/LevelUtil.py
  2. 1 1
      direct/src/level/SpecUtil.py

+ 3 - 1
direct/src/level/LevelUtil.py

@@ -25,7 +25,9 @@ def getZoneNum2Node(levelModel):
                 continue
                 continue
             num = int(name[:numDigits])
             num = int(name[:numDigits])
             # do we already have a ZoneNode for this zone num?
             # do we already have a ZoneNode for this zone num?
-            assert not num in num2node
+            if num in num2node:
+                print 'warning: zone %s already assigned to %s. ignoring %s' % (
+                    num, num2node[num], potentialNode)
             num2node[num] = potentialNode
             num2node[num] = potentialNode
 
 
         return num2node
         return num2node

+ 1 - 1
direct/src/level/SpecUtil.py

@@ -19,7 +19,7 @@ def makeNewSpec(filename, modelPath, entTypeModule=EntityTypes):
 import SpecUtil
 import SpecUtil
 import SellbotLegFactorySpec
 import SellbotLegFactorySpec
 import FactoryEntityTypes
 import FactoryEntityTypes
-SpecUtil.updateSpec(SellbotLegFactorySpec, FactoryEntityTypes, 'phase_9/models/cogHQ/newModel')
+SpecUtil.updateSpec(SellbotLegFactorySpec, FactoryEntityTypes, optional newModelPath)
 """
 """
 
 
 def updateSpec(specModule, entTypeModule=EntityTypes, modelPath=None):
 def updateSpec(specModule, entTypeModule=EntityTypes, modelPath=None):