Mercurial > fife-parpg
changeset 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 | c916d7b7de1c |
| children | 796d49ab9380 |
| files | demos/shooter/scripts/world.py |
| diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/demos/shooter/scripts/world.py Fri May 28 04:15:56 2010 +0000 +++ b/demos/shooter/scripts/world.py Fri May 28 14:49:43 2010 +0000 @@ -142,8 +142,6 @@ #@todo: you should be able to add file imports via the map editor loadImportFile("objects/projectiles/bullet1/object.xml", self._engine) loadImportFile("objects/projectiles/fireball/object.xml", self._engine) - loadImportFile("objects/powerups/cannonspread5/object.xml", self._engine) - loadImportFile("objects/powerups/extralife/object.xml", self._engine) self._map = loadMapFile(self._filename, self._engine)