Changeset 2363 for 2011/26/JaakkoL


Ignore:
Timestamp:
2011-06-30 14:23:14 (8 years ago)
Author:
teeevasa
Message:
 
Location:
2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Player.cs

    r2361 r2363  
    1515 
    1616    Pistol pistol; 
    17     // Rifle rifle; 
     17    Rifle rifle; 
    1818 
    1919    Timer walker; 
     
    3737        pistol.X = 18; 
    3838        pistol.Y = 11; 
    39         this.Weapon = pistol; // The default weapon 
     39        //this.Weapon = pistol; // The default weapon 
    4040        pistol.ProjectileCollision += bulletReachedTarget; 
    4141 
    42         /* 
    4342        rifle = new Rifle(20.0, 10.0); 
    4443        rifle.X = 18; 
    45         rifle.Y = 11;         
     44        rifle.Y = 11; 
     45        this.Weapon = rifle; 
    4646        rifle.ProjectileCollision += bulletReachedTarget; 
    47         */ 
     47         
    4848        // Collision handlers for enemies 
    4949        //AddCollisionHandler(); 
  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Weapons.cs

    r2360 r2363  
    4949    } 
    5050 
    51     protected override PhysicsObject CreateProjectileRifle() 
     51    protected override PhysicsObject CreateProjectile() 
    5252    { 
    53         Projectile proj2 = new Projectile(1, 1.5, Color.DarkGray); 
    54         proj2.CollisionIgnoreGroup = 1; 
    55         return proj2; 
     53        Projectile proj = new Projectile(1, 1.5, Color.DarkGray); 
     54        proj.CollisionIgnoreGroup = 1; 
     55        return proj; 
    5656    } 
    5757 
     
    6161    } 
    6262 
    63     public string namer() 
     63    public string name() 
    6464    { 
    6565        return "Rifle"; 
Note: See TracChangeset for help on using the changeset viewer.