Changeset 2280 for 2011/26


Ignore:
Timestamp:
2011-06-29 12:39:41 (8 years ago)
Author:
teeevasa
Message:
 
Location:
2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/GenWeapon.cs

    r2276 r2280  
    1717    private void loadWeapon(string weaponName) 
    1818    { 
    19         //weapon = Pistol(); 
     19        //weapon = Weapons.Pistol(); 
    2020    } 
    2121 
  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Weapons.cs

    r2276 r2280  
    2222    /*public static Weapon Pistol() 
    2323    { 
    24         Weapon weapon = new Weapon( 
     24        return new Weapon( 
    2525            0, 
    2626            0, 
  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372Content/Rogue Agent 2372Content.contentproj

    r2276 r2280  
    8585  </ItemGroup> 
    8686  <ItemGroup> 
    87     <Compile Include="Sounds\Super Metroid Brinstar 2.wma"> 
    88       <Name>Super Metroid Brinstar 2</Name> 
    89       <Importer>WmaImporter</Importer> 
    90       <Processor>SongProcessor</Processor> 
    91     </Compile> 
    92     <Compile Include="Sounds\SuperMetroidCrateriaSurface.wma"> 
    93       <Name>SuperMetroidCrateriaSurface</Name> 
    94       <Importer>WmaImporter</Importer> 
    95       <Processor>SongProcessor</Processor> 
    96     </Compile> 
    97     <Compile Include="Sounds\Super Metroid Norfair 2.wma"> 
    98       <Name>Super Metroid Norfair 2</Name> 
    99       <Importer>WmaImporter</Importer> 
    100       <Processor>SongProcessor</Processor> 
    101     </Compile> 
    102   </ItemGroup> 
    103   <ItemGroup> 
    10487    <Compile Include="Sounds\pistolshot.wav"> 
    10588      <Name>pistolshot</Name> 
    10689      <Importer>WavImporter</Importer> 
    10790      <Processor>SoundEffectProcessor</Processor> 
     91    </Compile> 
     92  </ItemGroup> 
     93  <ItemGroup> 
     94    <Compile Include="Sounds\Stage1Music.mp3"> 
     95      <Name>Stage1Music</Name> 
     96      <Importer>Mp3Importer</Importer> 
     97      <Processor>SongProcessor</Processor> 
     98    </Compile> 
     99    <Compile Include="Sounds\Stage2Music.mp3"> 
     100      <Name>Stage2Music</Name> 
     101      <Importer>Mp3Importer</Importer> 
     102      <Processor>SongProcessor</Processor> 
     103    </Compile> 
     104    <Compile Include="Sounds\TitleScreenMusic.mp3"> 
     105      <Name>TitleScreenMusic</Name> 
     106      <Importer>Mp3Importer</Importer> 
     107      <Processor>SongProcessor</Processor> 
    108108    </Compile> 
    109109  </ItemGroup> 
Note: See TracChangeset for help on using the changeset viewer.