Changeset 5270 for 2014/27

Timestamp:

2014-07-02 10:48:59 (5 years ago)

Author:

mijoilmo

Message:

 

Location:

2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor

Files:

• Protokolla236TrueSurvivor/Player.cs (modified) (5 diffs)
• Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs (modified) (1 diff)
• Protokolla236TrueSurvivor/bin/x86/Debug/Content/graphics/levels/test.xnb (deleted)
• Protokolla236TrueSurvivor/bin/x86/Debug/Protokolla236TrueSurvivor.exe (modified) (previous)
• Protokolla236TrueSurvivor/bin/x86/Debug/Protokolla236TrueSurvivor.pdb (modified) (previous)
• Protokolla236TrueSurvivor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)
• Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt (modified) (2 diffs)
• Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csprojResolveAssemblyReference.cache (modified) (previous)
• Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.exe (modified) (previous)
• Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.pdb (added)
• Protokolla236TrueSurvivorContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache (modified) (previous)

2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Player.cs

@@ -10 +10 @@
 {
     GameObject thrusterEffect;
+    Level level;
     public void rotate(double rotSpeed)
     {
@@ -17 +18 @@
     {
         this.thrusterEffect.IsVisible = true;
-        this.Push(Vector.FromLengthAndAngle(speed*800, this.Angle + Angle.RightAngle));
+        this.Push(Vector.FromLengthAndAngle(speed * 800, this.Angle + Angle.RightAngle));
     }
     public void thrusterEnd()
@@ -24 +25 @@
         //if this.ids, enable ids
     }
-    public Player()
+    public Player(Level level)
         : base(40, 40)
     {
         this.Image = Proto236b.images["player"];
+        this.level = level;
         bool IDS = true; //inertial dampening system, katsotaan pistetäänkö ostettavaksi peliin
         if (IDS == true)
@@ -39 +41 @@
         this.AngularDamping = 0.7;
 
-        this.thrusterEffect = new GameObject(40,40);
+        this.thrusterEffect = new GameObject(40, 40);
         thrusterEffect.Image = Proto236b.images["player_thruster"];
         thrusterEffect.IsVisible = false;
@@ -47 +49 @@
     public override void Update(Time time)
     {
-        if (this.Position.X>Level.Left){}
+        if (this.Position.X > this.level.Right)
+        {
+            this.X = this.level.Left;
+        }
+        else if (this.Position.X < this.level.Left)
+        {
+            this.X = this.level.Right;
+        }
         base.Update(time);
     }

2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor.cs

@@ -66 +66 @@
         // TODO: Kirjoita peli tähän
         LoadAllImages();
-        this.player = new Player();
+        this.player = new Player(Level);
         this.player.IsUpdated = true;
         LoadLevel("0");

2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/obj/x86/Debug/Protokolla236TrueSurvivor.csproj.FileListAbsolute.txt

@@ +1 @@
+C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb
+C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb
+C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb
+C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb
+C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb
 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.exe
 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.pdb
@@ -7 +12 @@
 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe
 C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb
-C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb
-C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb
-C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.exe
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.pdb
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.dll
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.xml
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.csprojResolveAssemblyReference.cache
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb
-D:\Csharp feat jypeli\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb
-<<<<<<< .mine
-=======
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\backgrounds\space_background.xnb
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\0.xnb
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\ships\player.xnb
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.exe
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Protokolla236TrueSurvivor.pdb
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.dll
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Jypeli.xml
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.csprojResolveAssemblyReference.cache
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Microsoft.Xna.Framework.RuntimeProfile.txt
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.exe
-C:\MyTemp\AleksanteriV2014\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\obj\x86\Debug\Protokolla236TrueSurvivor.pdb
-C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\levels\test.xnb
->>>>>>> .r5263
-C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.1.xnb
-C:\MyTemp\AleksanteriV\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\Protokolla236TrueSurvivor\bin\x86\Debug\Content\graphics\effects\thrusters\thruster0.2.xnb
->>>>>>> .r5261