X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fmobs%2FPig.java;h=ecc93978ff0bf6e0db87bf0beeec4d526c0bbbac;hp=e36da71cdb37d855235287fe8c00a9ac6a4799d7;hb=84377178320105196ad70bfa798ba8f299f961b2;hpb=f894e0e20eb63a2b489ccfa2f5e64b98bf0c9a34

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
index e36da71..ecc9397 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
@@ -5,10 +5,13 @@ import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavedroid.misc.Assets;
 
+import static ru.deadsoftware.cavedroid.GameScreen.GP;
+import static ru.deadsoftware.cavedroid.misc.Assets.pigSprite;
+
 public class Pig extends Mob {
 
     public Pig(float x, float y) {
-        super(x, y, 25, 18, MathUtils.random(1));
+        super(x, y, 25, 18, Mob.randomDir());
         mov = new Vector2(looksLeft() ? -1 : 1, 0);
     }
 
@@ -32,27 +35,32 @@ public class Pig extends Mob {
         }
     }
 
+    @Override
+    public int getType() {
+        return 0;
+    }
+
     @Override
     public void draw(SpriteBatch spriteBatch, float x, float y) {
-        Assets.pigSprite[0][1].setRotation(anim);
-        Assets.pigSprite[1][1].setRotation(-anim);
+        if (x + getWidth() - GP.world.getWidthPx() >= 0 && x - GP.world.getWidthPx() <= getWidth()) {
+            x -= GP.world.getWidthPx();
+        } else if (x + getWidth() + GP.world.getWidthPx() >= 0 && x + GP.world.getWidthPx() <= getWidth()) {
+            x += GP.world.getWidthPx();
+        }
+
+        pigSprite[0][1].setRotation(getAnim());
+        pigSprite[1][1].setRotation(-getAnim());
         //back legs
-        Assets.pigSprite[1][1].setPosition(x - 4 + (9 - getDirection() * 9), y + 6);
-        Assets.pigSprite[1][1].draw(spriteBatch);
-        Assets.pigSprite[1][1].setPosition(x + 17 - (9 * getDirection()), y + 6);
-        Assets.pigSprite[1][1].draw(spriteBatch);
+        pigSprite[1][1].setPosition(x - 4 + (9 - getDirection() * 9), y + 6);
+        pigSprite[1][1].draw(spriteBatch);
+        pigSprite[1][1].setPosition(x + 17 - (9 * getDirection()), y + 6);
+        pigSprite[1][1].draw(spriteBatch);
         //front legs
-        Assets.pigSprite[0][1].setPosition(x - 4 + (9 - getDirection() * 9), y + 6);
-        Assets.pigSprite[0][1].draw(spriteBatch);
-        Assets.pigSprite[0][1].setPosition(x + 17 - (9 * getDirection()), y + 6);
-        Assets.pigSprite[0][1].draw(spriteBatch);
+        pigSprite[0][1].setPosition(x - 4 + (9 - getDirection() * 9), y + 6);
+        pigSprite[0][1].draw(spriteBatch);
+        pigSprite[0][1].setPosition(x + 17 - (9 * getDirection()), y + 6);
+        pigSprite[0][1].draw(spriteBatch);
         //head & body
         spriteBatch.draw(Assets.pigSprite[getDirection()][0], x, y);
     }
-
-    @Override
-    public int getType() {
-        return 0;
-    }
-
 }