Changeset 5195 for 2014

Timestamp:

2014-07-01 10:02:13 (9 years ago)

Author:

arjuhoyl

Message:

 

Location:

2014/27/ArttuH/pong

Files:

• pong.suo (modified) (previous)
• pong/pong/bin/x86/Debug/pong.exe (modified) (previous)
• pong/pong/bin/x86/Debug/pong.pdb (modified) (previous)
• pong/pong/obj/x86/Debug/ContentPipeline-{A41E2C13-FB6C-4B31-8708-F856A339D2D3}.xml (modified) (1 diff)
• pong/pong/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• pong/pong/obj/x86/Debug/pong.csproj.FileListAbsolute.txt (modified) (1 diff)
• 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/pong/pong.cs (modified) (5 diffs)
• pong/pongContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)

2014/27/ArttuH/pong/pong/pong/obj/x86/Debug/ContentPipeline-{A41E2C13-FB6C-4B31-8708-F856A339D2D3}.xml

@@ -17 +17 @@
       <Assembly>
         <Key>C:\Windows\Microsoft.Net\assembly\GAC_32\Microsoft.Xna.Framework.Content.Pipeline\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.Content.Pipeline.dll</Key>
-        <Value>2014-04-22T21:32:12.354917+03:00</Value>
+        <Value>2014-04-22T20:39:23.3459982+03:00</Value>
       </Assembly>
     </Assemblies>

2014/27/ArttuH/pong/pong/pong/obj/x86/Debug/pong.csproj.FileListAbsolute.txt

@@ -1 +1 @@
 C:\MyTemp\ArttuH\pong\pong\pong\bin\x86\Debug\pong.exe
 C:\MyTemp\ArttuH\pong\pong\pong\bin\x86\Debug\pong.pdb
-C:\MyTemp\ArttuH\pong\pong\pong\bin\x86\Debug\Jypeli.dll
 C:\MyTemp\ArttuH\pong\pong\pong\bin\x86\Debug\Jypeli.xml
 C:\MyTemp\ArttuH\pong\pong\pong\obj\x86\Debug\pong.csprojResolveAssemblyReference.cache

2014/27/ArttuH/pong/pong/pong/pong.cs

@@ -23 +23 @@
     IntMeter pelaajan1pisteet;
     IntMeter pelaajan2pisteet;
-    PhysicsObject oikeareuna;
-    PhysicsObject vasenreuna;
 
     public override void Begin()
@@ -53 +51 @@
         maila2 = luoMaila(Level.Right - 20.0, 0.0);
 
-        vasenreuna = Level.CreateLeftBorder();
-        vasenreuna.Restitution = 1.0;
-        vasenreuna.IsVisible = false;
-        oikeareuna = Level.CreateRightBorder();
-        oikeareuna.Restitution = 1.0;
-        oikeareuna.IsVisible = false;
-        PhysicsObject alalreuna = Level.CreateBottomBorder();
-        oikeareuna.Restitution = 1.0;
-        oikeareuna.IsVisible = false;
-        PhysicsObject ylareuna = Level.CreateTopBorder();
-        ylareuna.Restitution = 1.0;
-        ylareuna.IsVisible = false;
+        vasenReuna = Level.CreateLeftBorder();
+        vasenReuna.Restitution = 1.0;
+        vasenReuna.IsVisible = false;
+
+        oikeaReuna = Level.CreateRightBorder();
+        oikeaReuna.Restitution = 1.0;
+        oikeaReuna.IsVisible = false;
+
+        PhysicsObject alaReuna = Level.CreateBottomBorder();
+        alaReuna.Restitution = 1.0;
+        alaReuna.IsVisible = false;
+
+        PhysicsObject ylaReuna = Level.CreateTopBorder();
+        ylaReuna.Restitution = 1.0;
+        ylaReuna.IsVisible = false;
+
         Level.Background.Color = Color.Black;
 
@@ -72 +74 @@
     void aloitapeli()
     {
-        Vector impulssi = new Vector(500.0, 0.0);
+        Vector impulssi = new Vector(900.0, 0.0);
         pallo.Hit (impulssi);
     }
@@ -135 +137 @@
     naytto.Y = y;
     naytto.TextColor = Color.White;
-    naytto.BorderColor = Level.BackgroundColor;
+    naytto.BorderColor = Level.Background.Color;
     naytto.Color = Level.Background.Color;
     Add(naytto);
@@ -143 +145 @@
 void kasittelepallontormays(PhysicsObject pallo, PhysicsObject kohde)
 {
-    if (kohde == oikeareuna)
+    if (kohde == oikeaReuna)
     {
         pelaajan1pisteet.Value += 1;
     }
-    else if (kohde == vasenreuna)
+    else if (kohde == vasenReuna)
     {
         pelaajan2pisteet.Value += 1;