Changeset 4377 for 2013

Timestamp:

2013-07-02 15:32:09 (10 years ago)

Author:

janiemit

Message:

 

Location:

2013/27/TeemuM/Game/Game

Files:

• Game/Game-c.cs (added)
• Game/Player.cs (modified) (2 diffs)
• Game/UI.cs (modified) (1 diff)
• Game/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• GameContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)

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

@@ -11 +11 @@
     const double defaultMoveSpeed = 1000;
     double speed = defaultMoveSpeed;
+    static Image pelaaja = Game.LoadImage("playerImage");
 
     public Player(Game game, double width, double height) : base(width, height)
     {
         this.Shape = Shape.Circle;
-        this.Image = G.game.playerImage;
+        this.Image = pelaaja;
         this.LinearDamping = 0.9;
         
@@ -24 +25 @@
     public void SetControls()
     {
-        G.game.Keyboard.Listen(Key.W, ButtonState.Down, delegate { this.Push(new Vector(0, speed)); }, null);
-        G.game.Keyboard.Listen(Key.S, ButtonState.Down, delegate { this.Push(new Vector(0, -speed)); }, null);
-        G.game.Keyboard.Listen(Key.A, ButtonState.Down, delegate { this.Push(new Vector(-speed, 0)); }, null);
-        G.game.Keyboard.Listen(Key.D, ButtonState.Down, delegate { this.Push(new Vector(speed, 0)); }, null);
-        G.game.Mouse.Listen(MouseButton.Left, ButtonState.Pressed, Shoot, null);
+        Game.Keyboard.Listen(Key.W, ButtonState.Down, delegate { this.Push(new Vector(0, speed)); }, null);
+        Game.Keyboard.Listen(Key.S, ButtonState.Down, delegate { this.Push(new Vector(0, -speed)); }, null);
+        Game.Keyboard.Listen(Key.A, ButtonState.Down, delegate { this.Push(new Vector(-speed, 0)); }, null);
+        Game.Keyboard.Listen(Key.D, ButtonState.Down, delegate { this.Push(new Vector(speed, 0)); }, null);
+        Game.Mouse.Listen(MouseButton.Left, ButtonState.Pressed, Shoot, null);
     }
 

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

@@ -10 +10 @@
 using Jypeli.Widgets;
 
-class UI
+public class UI
 {
-    public static int Menu()
+    public static int Menu(String title, String[] options, Action selectionHandler)
     {
         int selectedItem = -1;
-        MultiSelectWindow Menu = new MultiSelectWindow("Welcome to Game", "Start Game", "Scoreboard", "Exit");
-        Menu.ItemSelected += delegate(int selected) { selectedItem = selected; };
-        G.game.Add(Menu);
+        MultiSelectWindow Menu = new MultiSelectWindow("Welcome to Game", options);
+        Menu.ItemSelected += delegate(int selected) { selectionHandler(selected); };
+        Add(Menu);
         return selectedItem;
     }