Changeset 4392


Ignore:
Timestamp:
2013-07-03 12:53:35 (6 years ago)
Author:
teematma
Message:
 
Location:
2013/27/TeemuM/Game
Files:
5 edited

Legend:

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

    r4388 r4392  
    9393        AddScoreMeter(); 
    9494 
     95<<<<<<< .mine 
     96        createPlayer(); 
     97        createZ(); 
     98======= 
    9599        player = new Player(50, 50, 5, true); 
    96100        Add(player); 
    97101 
     102>>>>>>> .r4391 
    98103    } 
    99104     
    100105    void createZ() 
    101106    { 
    102         Add(new Zombie1(50, 50, 100, 100, 5));         
     107        Add(new Zombie1(50, 50, 100, 100, 5)); 
     108    } 
     109 
     110    void createPlayer() 
     111    { 
     112        player = new Player(50, 50, true); 
     113        Add(player); 
    103114    } 
    104115 
  • 2013/27/TeemuM/Game/Game/GameContent/GameContent.contentproj

    r4385 r4392  
    7474    </Compile> 
    7575  </ItemGroup> 
    76   <ItemGroup> 
    77     <Compile Include="DungeonM1.mid"> 
    78       <Name>DungeonM1</Name> 
    79     </Compile> 
    80     <Compile Include="DungeonM2.mid"> 
    81       <Name>DungeonM2</Name> 
    82     </Compile> 
    83     <Compile Include="DungeonM3.mid"> 
    84       <Name>DungeonM3</Name> 
    85     </Compile> 
    86     <Compile Include="DungeonM4.mid"> 
    87       <Name>DungeonM4</Name> 
    88     </Compile> 
    89     <Compile Include="GameM1.mid"> 
    90       <Name>GameM1</Name> 
    91     </Compile> 
    92     <Compile Include="GameM2.mid"> 
    93       <Name>GameM2</Name> 
    94     </Compile> 
    95     <Compile Include="GameM3.mid"> 
    96       <Name>GameM3</Name> 
    97     </Compile> 
    98     <Compile Include="GameM4.mid"> 
    99       <Name>GameM4</Name> 
    100     </Compile> 
    101     <Compile Include="MenuMusick.mid"> 
    102       <Name>MenuMusick</Name> 
    103     </Compile> 
    104   </ItemGroup> 
    10576  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    10677  <!--  To modify your build process, add your task inside one of the targets below and uncomment it.  
Note: See TracChangeset for help on using the changeset viewer.