Mercurial > fife-parpg
comparison demos/shooter/scripts/world.py @ 527:79d5741fada6
removed the explicit loadImportFile calls that were loading the cannonspread and extralife as these are now added to the map file. This was causing a NameClash exception to be thrown because the game was attempting to load them twice.
author | vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 |
---|---|
date | Fri, 28 May 2010 14:49:43 +0000 |
parents | 96c4922c1c24 |
children | e3140f01749d |
comparison
equal
deleted
inserted
replaced
526:c916d7b7de1c | 527:79d5741fada6 |
---|---|
140 | 140 |
141 #specific imports that needed to be added | 141 #specific imports that needed to be added |
142 #@todo: you should be able to add file imports via the map editor | 142 #@todo: you should be able to add file imports via the map editor |
143 loadImportFile("objects/projectiles/bullet1/object.xml", self._engine) | 143 loadImportFile("objects/projectiles/bullet1/object.xml", self._engine) |
144 loadImportFile("objects/projectiles/fireball/object.xml", self._engine) | 144 loadImportFile("objects/projectiles/fireball/object.xml", self._engine) |
145 loadImportFile("objects/powerups/cannonspread5/object.xml", self._engine) | |
146 loadImportFile("objects/powerups/extralife/object.xml", self._engine) | |
147 | 145 |
148 self._map = loadMapFile(self._filename, self._engine) | 146 self._map = loadMapFile(self._filename, self._engine) |
149 | 147 |
150 self._scene = Scene(self, self._engine, self._map.getLayer('objects'), self._soundmanager) | 148 self._scene = Scene(self, self._engine, self._map.getLayer('objects'), self._soundmanager) |
151 self._scene.initScene(self._map) | 149 self._scene.initScene(self._map) |