# HG changeset patch
# User prock@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1273069777 0
# Node ID 0324a3533988fd850ddf19788ba4aa996d598af9
# Parent  23d01971e9c224b3d947178d8da3080dd0bb79ca
Updated the Shooter demo credits.txt file and added the LICENSE file for all media included in the demo.
Cleaned up some print statements in the shooter demo.

diff -r 23d01971e9c2 -r 0324a3533988 demos/shooter/LICENSE
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/demos/shooter/LICENSE	Wed May 05 14:29:37 2010 +0000
@@ -0,0 +1,56 @@
+== AUDIO ==
+
+=== Level 1 Music ===
+Author :
+Murray Krawchuck
+
+License :
+Creative Commons Attribution-Noncommercial-Share Alike 2.5
+http://creativecommons.org/licenses/by-nc-sa/2.5/
+
+Affected files:
+music/waynesmind.ogg
+
+
+=== Sound Effects ===
+Author :
+FIFE Team (http://www.fifengine.net)
+
+License :
+Creative Commons Sampling Plus 1.0
+http://creativecommons.org/licenses/sampling+/1.0/
+
+Affected files:
+sounds/*.ogg
+
+
+
+
+== GRAPHICS ==
+
+=== Ships ===
+Author:
+Castle Games Inc. (http://www.castlegamesinc.com/legal/contact-form)
+
+Website:
+http://www.castlegamesinc.com/
+
+License:
+Creative Commons Attribution-Noncommercial-Share Alike 2.5
+http://creativecommons.org/licenses/by-nc-sa/2.5/
+
+Affected files:
+objects/ships/*/*.png
+
+
+=== Backgrounds ===
+Author:
+FIFE Team (http://www.fifengine.net)
+
+License : 
+Creative Commons Attribution-Share Alike 3.0 Unported
+http://creativecommons.org/licenses/by-sa/3.0/
+
+Affected files:
+objects/backgrounds/*/*.png
+objects/powerups/*/*.png
\ No newline at end of file
diff -r 23d01971e9c2 -r 0324a3533988 demos/shooter/gui/credits.txt
--- a/demos/shooter/gui/credits.txt	Tue May 04 12:50:09 2010 +0000
+++ b/demos/shooter/gui/credits.txt	Wed May 05 14:29:37 2010 +0000
@@ -1,8 +1,22 @@
-This is the credits file.
+--== FIFE Shooter ==-        
+
+This demo was created by the FIFE team to show the 
+versatility of the FIFEngine.  We hope that it 
+will attract some new projects to use FIFE so we 
+can grow our community!
 
-Information regarding who worked on this demo along
-with FIFE will go into this file.
+All ship art (objects/ships/*) were graciously 
+provided by JP of Castle Games Inc. Visit 
+http://www.castlegamesinc.com for more info.
 
-Thanks,
+The background music (music/waynesmind.ogg) was 
+written and composed by Murray Krawchuck.  
+
+All sound effects were generated with sfxr.
+Visit http://www.drpetter.se/project_sfxr.html 
+for more information.
+
+Thanks for checking this demo out,
 
 The FIFE team!
+
diff -r 23d01971e9c2 -r 0324a3533988 demos/shooter/scripts/powerups.py
--- a/demos/shooter/scripts/powerups.py	Tue May 04 12:50:09 2010 +0000
+++ b/demos/shooter/scripts/powerups.py	Wed May 05 14:29:37 2010 +0000
@@ -77,9 +77,12 @@
 class ExtraLifePU(PowerUp):
 	def __init__(self, scene, powerupName, instance, findInstance=True):
 		super(ExtraLifePU, self).__init__(scene, powerupName, instance, findInstance)
+		
+		self._pickupclip = self._scene.soundmanager.loadSoundClip("sounds/pickup.ogg")	
 	
 	def applyPowerUp(self, ship):
 		ship.lives += 1
+		self._scene.soundmanager.playClip(self._pickupclip)
 		self.destroy()
 		self._scene.queueObjectForRemoval(self)	
 		
\ No newline at end of file
diff -r 23d01971e9c2 -r 0324a3533988 demos/shooter/scripts/scene.py
--- a/demos/shooter/scripts/scene.py	Tue May 04 12:50:09 2010 +0000
+++ b/demos/shooter/scripts/scene.py	Wed May 05 14:29:37 2010 +0000
@@ -158,8 +158,6 @@
 		for instance in powerups:
 			objectName = instance.getId()
 			
-			print objectName
-			
 			if objectName == "cannonspread5":
 				powerup = CannonSpread5PU(self, 'cannonspread5', instance, False)
 			elif objectName == "extralife":
diff -r 23d01971e9c2 -r 0324a3533988 demos/shooter/scripts/soundmanager.py
--- a/demos/shooter/scripts/soundmanager.py	Tue May 04 12:50:09 2010 +0000
+++ b/demos/shooter/scripts/soundmanager.py	Wed May 05 14:29:37 2010 +0000
@@ -126,11 +126,8 @@
 					
 				if clip.looping:
 					repeat = 0
-					print "setting up callback1"
-
 					def real_callback(c, e):
 						c()
-						print "in here"
 						e.stop()
 						e.play()
 
@@ -138,7 +135,6 @@
 
 				else:
 					repeat = 1
-
 					
 				clip.timer = Timer(self._engine.getTimeManager(), clip.duration, clip.callback, repeat)
 				clip.timer.start()