Changeset 4394 for 2013/27


Ignore:
Timestamp:
2013-07-03 13:49:41 (7 years ago)
Author:
teematma
Message:
 
Location:
2013/27/TeemuM/Game
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • 2013/27/TeemuM/Game/Game/Game/Enemies.cs

    r4387 r4394  
    1212{ 
    1313 
    14     IntMeter zombieHealth1; 
     14    public IntMeter zombieHealth1; 
    1515 
    1616    private static Image[] Images = { Game.LoadImage("Zombie1"), Game.LoadImage("Zombie2"), Game.LoadImage("Zombie3"), Game.LoadImage("Zombie4") }; 
  • 2013/27/TeemuM/Game/Game/Game/Game.cs

    r4392 r4394  
    9393        AddScoreMeter(); 
    9494 
    95 <<<<<<< .mine 
    9695        createPlayer(); 
    9796        createZ(); 
    98 ======= 
    99         player = new Player(50, 50, 5, true); 
    100         Add(player); 
    10197 
    102 >>>>>>> .r4391 
    10398    } 
    10499     
    105100    void createZ() 
    106101    { 
    107         Add(new Zombie1(50, 50, 100, 100, 5)); 
     102        Zombie1 zed1 = new Zombie1(50, 50, RandomGen.NextDouble(Level.Left, Level.Right), RandomGen.NextDouble(Level.Bottom, Level.Top), 100); 
     103        Add(zed1); 
    108104    } 
    109105 
    110106    void createPlayer() 
    111107    { 
    112         player = new Player(50, 50, true); 
     108        player = new Player(50, 50, 100, true); 
    113109        Add(player); 
    114110    } 
Note: See TracChangeset for help on using the changeset viewer.