Changeset 2363 for 2011/26

Timestamp:

2011-06-30 14:23:14 (12 years ago)

Author:

teeevasa

Message:

 

Location:

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372

Files:

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

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Player.cs

@@ -15 +15 @@
 
     Pistol pistol;
-    // Rifle rifle;
+    Rifle rifle;
 
     Timer walker;
@@ -37 +37 @@
         pistol.X = 18;
         pistol.Y = 11;
-        this.Weapon = pistol; // The default weapon
+        //this.Weapon = pistol; // The default weapon
         pistol.ProjectileCollision += bulletReachedTarget;
 
-        /*
         rifle = new Rifle(20.0, 10.0);
         rifle.X = 18;
-        rifle.Y = 11;        
+        rifle.Y = 11;
+        this.Weapon = rifle;
         rifle.ProjectileCollision += bulletReachedTarget;
-        */
+        
         // Collision handlers for enemies
         //AddCollisionHandler();

2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Weapons.cs

@@ -49 +49 @@
     }
 
-    protected override PhysicsObject CreateProjectileRifle()
+    protected override PhysicsObject CreateProjectile()
     {
-        Projectile proj2 = new Projectile(1, 1.5, Color.DarkGray);
-        proj2.CollisionIgnoreGroup = 1;
-        return proj2;
+        Projectile proj = new Projectile(1, 1.5, Color.DarkGray);
+        proj.CollisionIgnoreGroup = 1;
+        return proj;
     }
 
@@ -61 +61 @@
     }
 
-    public string namer()
+    public string name()
     {
         return "Rifle";