Implement dependency injection for game classes #13

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / mobs / Pig.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
index e37ab3e3d4fe2db20dbff6e2a13052fd5cf96b7d..b362da73a38f6d831aa1fa54b9f2a2e6a9679a58 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Pig.java
@@ -3,6 +3,7 @@ package ru.deadsoftware.cavedroid.game.mobs;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
+import ru.deadsoftware.cavedroid.game.GameWorld;
 import ru.deadsoftware.cavedroid.misc.Assets;
 
 import static ru.deadsoftware.cavedroid.misc.Assets.pigSprite;
@@ -11,33 +12,33 @@ public class Pig extends Mob {
 
     public Pig(float x, float y) {
         super(x, y, 25, 18, randomDir(), Type.MOB);
-        move = new Vector2(looksLeft() ? -1 : 1, 0);
+        mMove = new Vector2(looksLeft() ? -1 : 1, 0);
     }
 
     @Override
     public void changeDir() {
         switchDir();
-        move.x = -1 + 2 * dirMultiplier();
+        mMove.x = -1 + 2 * dirMultiplier();
     }
 
     @Override
-    public void ai() {
+    public void ai(GameWorld gameWorld) {
         if (MathUtils.randomBoolean(.0025f)) {
-            if (move.x != 0f) {
-                move.x = 0;
+            if (mMove.x != 0f) {
+                mMove.x = 0;
             } else {
                 changeDir();
             }
         }
 
-        if (move.x != 0f) {
-            anim += animDelta;
+        if (mMove.x != 0f) {
+            mAnim += mAnimDelta;
         } else {
-            anim = 0;
+            mAnim = 0;
         }
 
-        if (anim >= 60 || anim <= -60) {
-            animDelta = -animDelta;
+        if (mAnim >= 60 || mAnim <= -60) {
+            mAnimDelta = -mAnimDelta;
         }
     }
 
@@ -46,16 +47,16 @@ public class Pig extends Mob {
         pigSprite[0][1].setRotation(getAnim());
         pigSprite[1][1].setRotation(-getAnim());
         //back legs
-        pigSprite[1][1].setPosition(x - 4 + (9 - dirMultiplier() * 9), y + 6);
+        pigSprite[1][1].setPosition(x + (9 - dirMultiplier() * 9), y + 12);
         pigSprite[1][1].draw(spriteBatch);
-        pigSprite[1][1].setPosition(x + 17 - (9 * dirMultiplier()), y + 6);
+        pigSprite[1][1].setPosition(x + 21 - (9 * dirMultiplier()), y + 12);
         pigSprite[1][1].draw(spriteBatch);
+        //head & body
+        spriteBatch.draw(Assets.pigSprite[dirMultiplier()][0], x, y);
         //front legs
-        pigSprite[0][1].setPosition(x - 4 + (9 - dirMultiplier() * 9), y + 6);
+        pigSprite[0][1].setPosition(x + (9 - dirMultiplier() * 9), y + 12);
         pigSprite[0][1].draw(spriteBatch);
-        pigSprite[0][1].setPosition(x + 17 - (9 * dirMultiplier()), y + 6);
+        pigSprite[0][1].setPosition(x + 21 - (9 * dirMultiplier()), y + 12);
         pigSprite[0][1].draw(spriteBatch);
-        //head & body
-        spriteBatch.draw(Assets.pigSprite[dirMultiplier()][0], x, y);
     }
 }