Changeset 4379

Timestamp:

2013-07-03 01:33:23 (10 years ago)

Author:

jumakall

Message:

 

Location:

2013/27/TeemuM/Game

Files:

• Game.suo (modified) (previous)
• Game/Game/Enemies.cs (modified) (3 diffs)
• Game/Game/bin/x86/Debug/Game.exe (modified) (previous)
• Game/Game/bin/x86/Debug/Game.pdb (modified) (previous)
• Game/Game/obj/x86/Debug/Game.exe (modified) (previous)
• Game/Game/obj/x86/Debug/Game.pdb (modified) (previous)

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

@@ -16 +16 @@
     {
         this.Shape = Shape.Circle;
-<<<<<<< .mine
         RandomTexture();
         CreateBrain();
@@ -26 +25 @@
     {
         this.Image = Images[RandomGen.NextInt(Images.Length)];
-=======
-        
->>>>>>> .r4377
     }
 
@@ -36 +32 @@
         brain.Speed = 100;
         brain.Active = true;
-        this.Brain = brain;        
+        this.Brain = brain;
     }