# HG changeset patch
# User vtchill@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1275058183 0
# Node ID 79d5741fada614d6070f37ab22f87ff8f7a5e2aa
# Parent  c916d7b7de1c72a876ac3f7548df42c764f9ee75
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.

diff -r c916d7b7de1c -r 79d5741fada6 demos/shooter/scripts/world.py
--- 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)