Changeset 4394 for 2013/27/TeemuM/Game

Timestamp:

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

Author:

teematma

Message:

 

Location:

2013/27/TeemuM/Game

Files:

• Game.suo (modified) (previous)
• Game/Game/Enemies.cs (modified) (1 diff)
• Game/Game/Game.cs (modified) (1 diff)
• Game/Game/bin/x86/Debug/Game.exe (modified) (previous)
• Game/Game/bin/x86/Debug/Game.pdb (modified) (previous)
• Game/Game/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• Game/Game/obj/x86/Debug/Game.exe (modified) (previous)
• Game/Game/obj/x86/Debug/ResolveAssemblyReference.cache (modified) (previous)

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

@@ -12 +12 @@
 {
 
-    IntMeter zombieHealth1;
+    public IntMeter zombieHealth1;
 
     private static Image[] Images = { Game.LoadImage("Zombie1"), Game.LoadImage("Zombie2"), Game.LoadImage("Zombie3"), Game.LoadImage("Zombie4") };

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);
     }