Mercurial > fife-parpg

diff demos/shooter/scripts/world.py @ 454:bd7e8f708adf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Time is now managed by the Scene object. Enemy projectiles are now a bit slower.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Tue, 06 Apr 2010 21:25:10 +0000
parents cf53848fb187
children e686b82d93d0
line wrap: on
line diff
--- a/demos/shooter/scripts/world.py	Tue Apr 06 19:12:41 2010 +0000
+++ b/demos/shooter/scripts/world.py	Tue Apr 06 21:25:10 2010 +0000
@@ -33,7 +33,6 @@
 from scripts.ships.shipbase import Ship
 from scripts.ships.player import Player
 from scripts.scene import Scene
-from scripts.weapons import Weapon
 
 class World(EventListenerBase):
 	"""
@@ -76,8 +75,6 @@
 		self.map = loadMapFile(filename, self.engine)
 
 		self.scene = Scene(self.engine, self.map.getLayer('objects'))
-		#self.initPlayer()
-		self.initCameras()
 		
 		self.mainwindow = pychan.loadXML('gui/mainwindow.xml')
 		self.fpstext = self.mainwindow.findChild(name="fps")
@@ -87,9 +84,8 @@
 		self.mainwindow.position = (0,0)
 		self.mainwindow.show()
 		
-		#give player the default weapon
-		self.scene.player.weapon = Weapon(self.scene, self.scene.player, 200)
 		self.scene.initScene(self.map)
+		self.initCameras()
 		
 	def initCameras(self):
 		"""