Changeset 4394 for 2013/27/TeemuM/Game/Game/Game/Game.cs

Timestamp:

2013-07-03 13:49:41 (10 years ago)

Author:

teematma

Message:

 

File:

• 2013/27/TeemuM/Game/Game/Game/Game.cs (modified) (1 diff)

2013/27/TeemuM/Game/Game/Game/Game.cs

@@ -93 +93 @@
         AddScoreMeter();
 
-<<<<<<< .mine
         createPlayer();
         createZ();
-=======
-        player = new Player(50, 50, 5, true);
-        Add(player);
 
->>>>>>> .r4391
     }
     
     void createZ()
     {
-        Add(new Zombie1(50, 50, 100, 100, 5));
+        Zombie1 zed1 = new Zombie1(50, 50, RandomGen.NextDouble(Level.Left, Level.Right), RandomGen.NextDouble(Level.Bottom, Level.Top), 100);
+        Add(zed1);
     }
 
     void createPlayer()
     {
-        player = new Player(50, 50, true);
+        player = new Player(50, 50, 100, true);
         Add(player);
     }