Changeset 2276 for 2011/26


Ignore:
Timestamp:
2011-06-29 12:33:24 (12 years ago)
Author:
teeevasa
Message:

Removed wma versions

Location:
2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372
Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/GenWeapon.cs

    r2268 r2276  
    55using Jypeli.Effects; 
    66using Jypeli.Widgets; 
    7 using Weapons; 
    87 
    98public class GenWeapon 
    … …  
    1716 
    1817    private void loadWeapon(string weaponName) 
    19     {  
    20          
     18    { 
     19        //weapon = Pistol(); 
    2120    } 
    2221 
    … …  
    2928struct Weapon 
    3029{  
    31     int reloadTime; 
    32     int firingInterval; 
    33     string name; 
    34     Image weaponImage; 
    35     Image bulletImage; 
    36     SoundEffect sound; 
     30    private int reloadTime; 
     31    private int firingInterval; 
     32    private string name; 
     33    private Image weaponImage; 
     34    private Image bulletImage; 
     35    private SoundEffect sound; 
    3736 
    3837    Weapon(int _reloadTime, int _firingInterval, string weaponName, 
    3938        string weaponImgPath, string bulletImgPath, string soundEffectPath) 
    4039    { 
    41         reloadTime = _reloadTime; 
    42         firingInterval = _firingInterval; 
    43         name = weaponName; 
    44         weaponImage = Game.LoadImage(weaponImgPath); 
    45         bulletImage = Game.LoadImage(bulletImgPath); 
    46         sound = Game.LoadSoundEffect(soundEffectPath); 
     40        this.reloadTime = _reloadTime; 
     41        this.firingInterval = _firingInterval; 
     42        this.name = weaponName; 
     43        this.weaponImage = Game.LoadImage(weaponImgPath); 
     44        this.bulletImage = Game.LoadImage(bulletImgPath); 
     45        this.sound = Game.LoadSoundEffect(soundEffectPath); 
    4746    } 
    4847} 

  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Peli.cs

    r2261 r2276  
    1818 
    1919        createLevel(); 
     20 
     21        //MediaPlayer.Play("SuperMetroidCrateriaSurface.wma"); 
    2022 
    2123        Camera.Follow(player); 

  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Player.cs

    r2261 r2276  
    1111    const int jumpSpeed = 1000; 
    1212    Image portrait = Game.LoadImage("Images/character"); 
     13    SoundEffect walking = Game.LoadSoundEffect("Sounds/pistolshot"); 
    1314 
    1415        public Player(double width, double height, Shape shape) 
    … …  
    3132        this.Walk(speed); 
    3233        //this.Image = Image.Mirror(portrait); 
     34 
    3335    } 
    3436 
    … …  
    3739        this.Walk(-speed); 
    3840        this.Image = Image.Mirror(portrait); 
     41        this.walking.Play(); 
    3942    } 
    4043 

  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372/Weapons.cs

    r2268 r2276  
    1818 * Each struct shall follow these specifications*/ 
    1919 
    20 namespace Weapons 
     20public static class Weapons 
    2121{ 
    22     public Weapon Pistol() 
     22    /*public static Weapon Pistol() 
    2323    { 
    24         return new Weapon( 
     24        Weapon weapon = new Weapon( 
    2525            0, 
    2626            0, 
    2727            "pistol", 
    2828            "Images/gausspistol", 
    29             "" 
    30             "Sounds/pistolshot") 
    31     } 
     29            "", 
     30            "Sounds/pistolshot"); 
     31    }*/ 
    3232} 

  • 2011/26/JaakkoL/Rogue Agent 2372/Rogue Agent 2372/Rogue Agent 2372Content/Rogue Agent 2372Content.contentproj

    r2261 r2276  
    8585  </ItemGroup> 
    8686  <ItemGroup> 
    87     <Folder Include="Sounds\" /> 
     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> 
     104    <Compile Include="Sounds\pistolshot.wav"> 
     105      <Name>pistolshot</Name> 
     106      <Importer>WavImporter</Importer> 
     107      <Processor>SoundEffectProcessor</Processor> 
     108    </Compile> 
    88109  </ItemGroup> 
    89110  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\$(XnaFrameworkVersion)\Microsoft.Xna.GameStudio.ContentPipeline.targets" /> 
Note: See TracChangeset for help on using the changeset viewer.