Changeset 5937

Timestamp:

2015-06-09 12:04:42 (4 years ago)

Author:

empaheik

Message:

 

Location:

2015/24/AleksiS/Pong

Files:

• Pong.v11.suo (modified) (previous)
• Pong/Pong/Pong.cs (modified) (3 diffs)
• Pong/Pong/bin/x86/Debug/Pong.exe (modified) (previous)
• Pong/Pong/bin/x86/Debug/Pong.pdb (modified) (previous)
• Pong/Pong/obj/x86/Debug/ContentPipeline-{5EDED11A-CE1C-443E-A0E9-2E390FEE0024}.xml (added)
• Pong/Pong/obj/x86/Debug/Pong.csprojResolveAssemblyReference.cache (modified) (previous)
• Pong/Pong/obj/x86/Debug/Pong.exe (modified) (previous)
• Pong/Pong/obj/x86/Debug/Pong.pdb (modified) (previous)
• Pong/PongContent/obj/x86/Debug/PongContent.contentprojResolveAssemblyReference.cache (modified) (previous)
• UpgradeLog2.htm (added)

2015/24/AleksiS/Pong/Pong/Pong/Pong.cs

@@ -21 +21 @@
         LuoKentta();
         AsetaOhjaimet();
+        LisaaLaskurit();
         AloitaPeli();
-        
+    }
+
+    void LisaaLaskurit ()
+    {
+        // ...
+    }
+
+    IntMeter LuoPisteLaskuri ()
+    {
+        IntMeter laskuri = new IntMeter(0);
+        laskuri.MaxValue = 10;
+
+        Label naytto = new Label();
+        naytto.BindTo(laskuri);
+        naytto.X = X;
+        naytto.Y = Y;
+        naytto.TextColor = Color.White;
+        naytto.BorderColor = Level.Background.Color;
+        naytto.Color = Level.Background.Color;
+        Add(naytto);
+
+        return laskuri;
+    }
         
         
@@ -77 +100 @@
 
             Keyboard.Listen(Key.Up, ButtonState.Down, AsetaNopeus, "Pelaaja 2: Liikuta mailaa ylös", maila2, nopeusYlos);
+            Keyboard.Listen(Key.Up, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
+            Keyboard.Listen(Key.Down, ButtonState.Down, AsetaNopeus, "Pelaaja2: Likkuta mailaa alas", maila2, nopeusAlas);
+            Keyboard.Listen(Key.Down, ButtonState.Released, AsetaNopeus, null, maila2, Vector.Zero);
 
-
-
+            Keyboard.Listen(Key.F1, ButtonState.Pressed, ShowControlHelp, "Näytä ohjeet");
             Keyboard.Listen(Key.Escape, ButtonState.Pressed, ConfirmExit, "Lopeta peli");
         }
@@ -85 +110 @@
         void AsetaNopeus(PhysicsObject maila, Vector nopeus)
         {
-            maila.Velocity = nopeus;
+            if ((nopeus.Y < 0) && (maila.Bottom < Level.Bottom))
+            {
+                maila.Velocity = Vector.Zero;
+                return;
+            }
+
+            if ((nopeus.Y > 0) && (maila.Top > Level.Top))
+            {
+                maila.Velocity = Vector.Zero;
+                return;
+            }
+
+                maila.Velocity = nopeus;
 
         }