fixed bug

brownan · Nov 25, 2010 · 47f595f · 47f595f
1 parent 8b5f98e
commit 47f595f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/asteroids.py b/asteroids.py
@@ -55,7 +55,7 @@ def __init__(self):
         # Player
         self.ship = ship.Ship(hud=self.hud)
 
-        self.level = 0
+        self.level = 1
         self.hud.set_level(self.level)
 
         # Set up first level

diff --git a/levels.py b/levels.py
@@ -25,6 +25,7 @@ def create_asteroids(self):
 
 
 level = [
+        None, # This array starts at 1
         Level(1, [0,2,0]),
         Level(2, [3,2,0]),
         Level(3, [5,3,1]),

diff --git a/ship.py b/ship.py
@@ -299,18 +299,18 @@ def damage(self, source):
         Source 0 is an asteroid
         source 1 is a bullet
         """
-        self.shields -= 1
-        if self.hud:
-            self.hud.set_shields(self.shields)
         if self.shields == 0:
             # KABOOM
             print "Kaboom"
             particle.explosion(self.pos, (0,10,0))
             self.lives -= 1
             self.hud.set_lives(self.lives)
             self._state = 4
-            self.reset()
+            self._reset()
         else:
+            self.shields -= 1
+            if self.hud:
+                self.hud.set_shields(self.shields)
             self._shield_vis = 1
             print "Shields:", self.shields