Changeset 6084 for 2015/24


Ignore:
Timestamp:
2015-06-13 20:03:47 (8 years ago)
Author:
sieerinn
Message:

Alkuvalikko.

Location:
2015/24/ohjaajat/Dungeon
Files:
3 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • 2015/24/ohjaajat/Dungeon

    • Property svn:ignore

      •  

        old new  
        11*.suo 
         2Dungeon.sln.DotSettings.user 

  • 2015/24/ohjaajat/Dungeon/Dungeon/Dungeon

    • Property svn:ignore set to
      Dungeon.csproj.Debug.cachefile

  • 2015/24/ohjaajat/Dungeon/Dungeon/Dungeon/Dungeon.cs

    r6083 r6084  
    247247    Vector huoneSiirtyma = new Vector(-200, 0); 
    248248 
     249    private MainMenu menu; 
     250 
    249251    public override void Begin() 
    250252    { 
    251         ansaKuvat = new Image[] { piikkiAnsaKuvat[0], murskausAnsaKuvat[0] }; 
     253        IsMouseVisible = true; 
    252254        //SetWindowSize(1024, 768); 
    253  
     255        ansaKuvat = new Image[] {piikkiAnsaKuvat[0], murskausAnsaKuvat[0]}; 
     256        menu = new MainMenu(this, "New game", "Highscores", "Help", "Quit"); 
     257        menu.Painikkeet[0].Clicked += AloitaPeli; 
     258        menu.Painikkeet[3].Clicked += Exit; 
     259    } 
     260 
     261    void AloitaPeli() 
     262    { 
    254263        ClearAll(); 
    255264        Kontrollit(); 
    … …  
    867876        } 
    868877 
     878        if (menu != null) 
     879            menu.Update(time); 
    869880        base.Update(time); 
    870881    } 

  • 2015/24/ohjaajat/Dungeon/Dungeon/Dungeon/Dungeon.csproj

    r5967 r6084  
    111111  </ItemGroup> 
    112112  <ItemGroup> 
     113    <Compile Include="MainMenu.cs" /> 
    113114    <Compile Include="Ohjelma.cs" /> 
    114115    <Compile Include="Dungeon.cs" /> 

  • 2015/24/ohjaajat/Dungeon/Dungeon/DungeonContent/DungeonContent.contentproj

    r6083 r6084  
    242242    </Compile> 
    243243  </ItemGroup> 
     244  <ItemGroup> 
     245    <Compile Include="pala.png"> 
     246      <Name>pala</Name> 
     247      <Importer>TextureImporter</Importer> 
     248      <Processor>TextureProcessor</Processor> 
     249    </Compile> 
     250    <Compile Include="ratas.png"> 
     251      <Name>ratas</Name> 
     252      <Importer>TextureImporter</Importer> 
     253      <Processor>TextureProcessor</Processor> 
     254    </Compile> 
     255  </ItemGroup> 
    244256  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
    245257  <!--  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.