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

Timestamp:

2013-07-03 12:53:35 (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));        
+        Add(new Zombie1(50, 50, 100, 100, 5));
+    }
+
+    void createPlayer()
+    {
+        player = new Player(50, 50, true);
+        Add(player);
     }