Changeset 4449 for 2013

Timestamp:

2013-07-04 20:05:08 (6 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM/Game/Game/Game

Files:

• Game.cs (modified) (2 diffs)
• Player.cs (modified) (2 diffs)

2013/27/TeemuM/Game/Game/Game/Game.cs

@@ -156 +156 @@
             else if (commands[0] == "die")
             {
-                // UI.GameOver();
+                player.canMove = false;
+                GameOver();
             }
             else if (commands[0] == "exit")
@@ -308 +309 @@
         Add(LifeBar);
     }
+
+
+
+    private void GameOver()
+    {
+        GameObject layer = new GameObject(Game.Screen.Width, Game.Screen.Height);
+        layer.Color = Color.Transparent;
+        layer.Position = player.Position;
+        Add(layer, 1);
+        layer.FadeColorTo(Color.Lerp(Color.Transparent, Color.Black, 0.8), 1.0);
+
+        Label t = new Label("Game over");
+        t.Position = player.Position;
+        t.TextColor = Color.White;
+        Add(t, 1);
+
+        Timer.SingleShot(1, delegate { IsPaused = true; });
+    }
 }

2013/27/TeemuM/Game/Game/Game/Player.cs

@@ -9 +9 @@
 public class Player : PhysicsObject
 {
+    private static Image playerImage = Game.LoadImage("Player");
+
+
     const double defaultSpeed = 1000;
     const int defaultPower = 10000;
-    private static Image playerImage = Game.LoadImage("Player");
+    private double speed = defaultSpeed;
+    private double power = defaultPower;
 
     private Weapon weapon;
-    private double speed = defaultSpeed;
     public IntMeter health;
-    private double power = defaultPower;
     public bool canMove = true;
+
+    //Handlers
+    public delegate void EmptyHandler();
+
+    //Events
+    public event EmptyHandler Dying;
 
     public Player(double width, double height, int health, bool addDefaultControls) : base(width, height)
@@ -24 +32 @@
         this.health.LowerLimit += delegate
         {
-            GameObject layer = new GameObject(Game.Screen.Width, Game.Screen.Height);
-            layer.Color = Color.Transparent;
-            layer.Position = this.Position;
-            Game.Add(layer, 1);
-            layer.FadeColorTo(Color.Lerp(Color.Transparent, Color.Black, 0.8), 1.0);
-
-            Label t = new Label("Game over");
-            t.Position = this.Position;
-            Game.Add(t);
-
-            Timer.SingleShot(1, delegate { Game.IsPaused = true; });
+            
 
             this.Destroy();