Changeset 3399

Timestamp:

2012-06-29 12:21:50 (11 years ago)

Author:

elalylon

Message:

Talletus.

Location:

2012/26/EliasY/test1

Files:

• test1.suo (modified) (previous)
• test1/test1/bin/x86/Debug/kentta.txt (modified) (1 diff)
• test1/test1/bin/x86/Debug/test1.exe (modified) (previous)
• test1/test1/bin/x86/Debug/test1.pdb (modified) (previous)
• test1/test1/obj/x86/Debug/test1.exe (modified) (previous)
• test1/test1/obj/x86/Debug/test1.pdb (modified) (previous)
• test1/test1/test1.cs (modified) (2 diffs)

2012/26/EliasY/test1/test1/test1/bin/x86/Debug/kentta.txt

@@ -18 +18 @@
 =  z   z ==    =z  z        =
 =       ==     =======  =  z=
-=      ==z     =  = =    ====
-=     ==       =  z ==z =   =
-=    a =   z   =  z  == m   =
+=      ==z     =  = =   =====
+=     ==       =  z ==z =  m=
+=    a =   z   =  z ===     =
 =      ==     =    ==z ==   =
 =  z    ==z    a  ==    =   =

2012/26/EliasY/test1/test1/test1/test1.cs

@@ -30 +30 @@
         Camera.Follow(pelaaja);
         Camera.ZoomFactor = 1.7;
-        /*todo:
-         * mapin fixaus
-         */
     }
 
@@ -197 +194 @@
         PhysicsObject konepistooli = PhysicsObject.CreateStaticObject(40.0, 15.0);
         konepistooli.Image = LoadImage("konepistooli");
-        AddCollisionHandler(pelaaja, konepistooli, delegate { 
+        AddCollisionHandler(pelaaja, konepistooli, delegate {
+            label1.Text = "Ase: Konepistooli";
             konepistooli.Destroy();
             MessageDisplay.Add("Löysit konepistoolin! Pystyt ampumaan sarjatulta.");