summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/rustanddust/RustAndDust.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java15
2 files changed, 6 insertions, 11 deletions
diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java
index 67f300f..17ccc8f 100644
--- a/core/src/ch/asynk/rustanddust/RustAndDust.java
+++ b/core/src/ch/asynk/rustanddust/RustAndDust.java
@@ -18,7 +18,6 @@ import ch.asynk.rustanddust.game.Config;
import ch.asynk.rustanddust.game.battles.Factory;
import ch.asynk.rustanddust.ui.Bg;
import ch.asynk.rustanddust.game.hud.UnitDock;
-import ch.asynk.rustanddust.game.hud.EngagementPanel;
public class RustAndDust extends Game
{
@@ -164,7 +163,6 @@ public class RustAndDust extends Game
Bg.setScale(Math.max((h * 0.00125f), 1.0f));
UnitDock.setScale(Math.max((h * 0.0005f), 0.4f));
- EngagementPanel.setDiceDimension((int) Math.max((h * 0.03f), 24));
}
private void unloadUiAssets()
diff --git a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
index 30114ae..599383a 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
@@ -1,5 +1,6 @@
package ch.asynk.rustanddust.game.hud;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.TextureAtlas;
@@ -56,15 +57,11 @@ public class EngagementPanel extends Patch implements Animation
this.defenseR = new Label(font);
this.okBtn = new Bg(uiAtlas.findRegion("ok"));
this.visible = false;
- this.d1Animation = new DiceAnimation(DICE_DIMENSION);
- this.d2Animation = new DiceAnimation(DICE_DIMENSION);
- this.d3Animation = new DiceAnimation(DICE_DIMENSION);
- this.d4Animation = new DiceAnimation(DICE_DIMENSION);
- }
-
- public static void setDiceDimension(int dimension)
- {
- DICE_DIMENSION = dimension;
+ int d = (int) Math.max((Gdx.graphics.getWidth() * 0.03f), DICE_DIMENSION);
+ this.d1Animation = new DiceAnimation(d);
+ this.d2Animation = new DiceAnimation(d);
+ this.d3Animation = new DiceAnimation(d);
+ this.d4Animation = new DiceAnimation(d);
}
public void updatePosition()