Changeset 897

Timestamp:

2010-06-16 11:20:49 (12 years ago)

Author:

hniemi

Message:

Aseenvaihto toimii

Location:

2010/23/hniemi/ShootEmUp

Files:

• ShootEmUp.suo (modified) (previous)
• ShootEmUp/Alus.cs (modified) (2 diffs)
• ShootEmUp/Content/obj/x86/Debug/ContentPipeline.xml (modified) (11 diffs)
• ShootEmUp/Peli.cs (modified) (1 diff)
• ShootEmUp/ShootEmUp.csproj (modified) (1 diff)
• ShootEmUp/Weapons.cs (modified) (2 diffs)
• ShootEmUp/obj/x86/Debug/ResolveAssemblyReference.cache (modified) (previous)
• ShootEmUp/obj/x86/Debug/ShootEmUp.csproj.FileListAbsolute.txt (modified) (1 diff)
• ShootEmUp/obj/x86/Debug/ShootEmUp.csproj.GenerateResource.Cache (modified) (previous)
• ShootEmUp/obj/x86/Debug/ShootEmUp.exe (modified) (previous)
• ShootEmUp/obj/x86/Debug/ShootEmUp.pdb (modified) (previous)

2010/23/hniemi/ShootEmUp/ShootEmUp/Alus.cs

@@ -41 +41 @@
             : base(width,height)
         {
+            this.kaytossaOlevaAse = new Beam(1, 1);
             this.Shape = Shapes.Rectangle;
             this.CanRotate = false;
@@ -61 +62 @@
         public void SetWeapon(Weapon ase) 
         {
-            if (kaytossaOlevaAse != null) kaytossaOlevaAse.Destroy();
-            ase.IsVisible = false;
-            this.Add(ase);
+            kaytossaOlevaAse.IsVisible = false;
+            ase.IsVisible = true;
             kaytossaOlevaAse = ase;
+
         }
 

2010/23/hniemi/ShootEmUp/ShootEmUp/Content/obj/x86/Debug/ContentPipeline.xml

@@ -9 +9 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen1.xnb</Output>
-      <Time>2010-06-11T19:57:56+03:00</Time>
+      <Time>2010-06-16T09:14:17.8987316+03:00</Time>
     </Item>
     <Item>
@@ -18 +18 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\ringout.xnb</Output>
-      <Time>2010-06-14T10:28:27.0625087+03:00</Time>
+      <Time>2010-06-16T09:14:17.8296971+03:00</Time>
     </Item>
     <Item>
@@ -27 +27 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\pum.xnb</Output>
-      <Time>2010-06-14T10:33:19.8792997+03:00</Time>
+      <Time>2010-06-16T09:14:17.8567106+03:00</Time>
     </Item>
     <Item>
@@ -36 +36 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\ohjus.xnb</Output>
-      <Time>2010-06-14T15:13:56.2405151+03:00</Time>
+      <Time>2010-06-16T09:14:17.9067356+03:00</Time>
     </Item>
     <Item>
@@ -45 +45 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen2.xnb</Output>
-      <Time>2010-06-11T19:57:36+03:00</Time>
+      <Time>2010-06-16T09:14:17.9137391+03:00</Time>
     </Item>
     <Item>
@@ -54 +54 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusThrust1.xnb</Output>
-      <Time>2010-06-15T12:15:45.427405+03:00</Time>
+      <Time>2010-06-16T09:14:17.7876761+03:00</Time>
     </Item>
     <Item>
@@ -63 +63 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusThrust2.xnb</Output>
-      <Time>2010-06-15T09:36:59.4334098+03:00</Time>
+      <Time>2010-06-16T09:14:17.7956801+03:00</Time>
     </Item>
     <Item>
@@ -72 +72 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusStop.xnb</Output>
-      <Time>2010-06-15T09:38:14.9813231+03:00</Time>
+      <Time>2010-06-16T09:14:17.7806726+03:00</Time>
     </Item>
     <Item>
@@ -81 +81 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sankarialus\sankarialusStopShield.xnb</Output>
-      <Time>2010-06-15T09:38:20.1289043+03:00</Time>
+      <Time>2010-06-16T09:14:17.7746696+03:00</Time>
     </Item>
     <Item>
@@ -90 +90 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen3.xnb</Output>
-      <Time>2010-06-15T11:22:42.3386343+03:00</Time>
+      <Time>2010-06-16T09:14:17.9217431+03:00</Time>
     </Item>
     <Item>
@@ -99 +99 @@
       <Options>None</Options>
       <Output>C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sade.xnb</Output>
-      <Time>2010-06-15T15:08:27.3746365+03:00</Time>
+      <Time>2010-06-16T09:14:17.8697171+03:00</Time>
     </Item>
     <BuildSuccessful>true</BuildSuccessful>

2010/23/hniemi/ShootEmUp/ShootEmUp/Peli.cs

@@ -137 +137 @@
             ((Missile)weapons[1]).MissileCollision = AmmusOsuu;
 
+            for (int i = 0; i < weapons.Length; i++)
+            {
+                pelaajaAlus.Add(weapons[i]);
+            }
+
             Add(pelaajaAlus);
-            pelaajaAlus.SetWeapon(weapons[0]);
+            pelaajaAlus.SetWeapon(weapons[1]);
             
             AddCollisionHandler(pelaajaAlus, PelaajaTormaa);

2010/23/hniemi/ShootEmUp/ShootEmUp/ShootEmUp.csproj

@@ -59 +59 @@
     <Reference Include="Jypeli2, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Jypeli2.dll</HintPath>
+      <HintPath>..\..\..\lib\Jypeli2.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Xna.Framework, Version=3.1.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d" />

2010/23/hniemi/ShootEmUp/ShootEmUp/Weapons.cs

@@ -106 +106 @@
         protected override PhysicsObject OnShoot()
         {
-            if (this.IsDestroyed())
+           
+            if (!this.IsDestroyed())
             {
+                //Game.MessageDisplay.Add("Debug");
                 PhysicsObject projectile = new PhysicsObject(Level * 30, Level * 15);
                 projectile.Shape = Shapes.Triangle;
@@ -115 +117 @@
                 SetCollisionHandler(projectile, MissileCollision);
                 ShootProjectile(projectile, 1000);
-                Game.Add(projectile);
+                //Game.Add(projectile);
                 projectile.IgnoresExplosions = true;
                 projectile.IgnoresCollisionResponse = true;

2010/23/hniemi/ShootEmUp/ShootEmUp/obj/x86/Debug/ShootEmUp.csproj.FileListAbsolute.txt

@@ -31 +31 @@
 C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\vihollinen3.xnb
 C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Content\sade.xnb
+C:\MyTemp\hniemi\ShootEmUp\ShootEmUp\bin\x86\Debug\Jypeli2.dll