Changeset 5299 for 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Player.cs

Timestamp:

2014-07-02 14:59:44 (8 years ago)

Author:

mijoilmo

Message:

kaiken muutin

File:

• 2014/27/AleksanteriV/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Protokolla236TrueSurvivor/Player.cs (modified) (4 diffs)

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

@@ -10 +10 @@
 {
     GameObject thrusterEffect;
-    Game parent;
+    Proto236b parent;
+
     public void rotate(double rotSpeed)
     {
@@ -25 +26 @@
         //if this.ids, enable ids
     }
-    public Player(Game parent)
+    public Player(Proto236b parent)
         : base(40, 40)
     {
-        this.Image = Proto236b.images["player"];
-        this.Shape = Shape.FromImage(Proto236b.images["player"]);
         this.parent = parent;
+        this.Image = parent.Images["player"];
+        this.Shape = Shape.FromImage(parent.Images["player"]);
         bool IDS = false; //inertial dampening system, katsotaan pistetäänkö ostettavaksi peliin
         if (IDS == true)
@@ -43 +44 @@
 
         this.thrusterEffect = new GameObject(40, 40);
-        thrusterEffect.Image = Proto236b.images["player_thruster"];
+        thrusterEffect.Image = parent.Images["player_thruster"];
         thrusterEffect.IsVisible = false;
         thrusterEffect.Y -= 20;
@@ -50 +51 @@
     public override void Update(Time time)
     {
-        Game parent = this.parent;
-        if (this.X + parent.Level.Width / 2.0 > parent.Level.Right)
-        {
-            if (this.X > parent.Level.Right)
-            {
-                //parent.Camera
-                this.X = parent.Level.Left;
-            }
+        base.Update(time);
+        if (this.X > parent.Level.Right) {
+            this.X = parent.Level.Left;
+        }else if (this.X < parent.Level.Left){
+            this.X = parent.Level.Right;
         }
-        base.Update(time);
     }
 }