summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-09 20:55:41 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-09 20:55:41 +0100
commit34a39b090df3f05b3780b72c080aa48d6e14dfea (patch)
tree285e9dd3b0e0536ceca86daa03231b8804b77e79 /core/src/ch/asynk/rustanddust/game
parent0f3efd0bd2fc84a1fae0ea4f812e2a7d92f36db4 (diff)
downloadRustAndDust-34a39b090df3f05b3780b72c080aa48d6e14dfea.zip
RustAndDust-34a39b090df3f05b3780b72c080aa48d6e14dfea.tar.gz
ui/typewriter.9.png -> assets/ui/bg.9.png
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Hud.java4
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java2
5 files changed, 6 insertions, 6 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java
index 0e1ddec..89b6349 100644
--- a/core/src/ch/asynk/rustanddust/game/Hud.java
+++ b/core/src/ch/asynk/rustanddust/game/Hud.java
@@ -66,8 +66,8 @@ public class Hud implements Disposable, Animation
playerInfo = new PlayerInfo(game);
actionButtons = new ActionButtons(game);
actionButtons.hide();
- msg = new Msg(game.font, game.ninePatch, 20f);
- okCancel = new OkCancel(game.font, game.ninePatch, game.factory.getHudRegion(game.factory.ACT_DONE), game.factory.getHudRegion(game.factory.ACT_ABORT));
+ msg = new Msg(game.font, game.bgPatch, 20f);
+ okCancel = new OkCancel(game.font, game.bgPatch, game.factory.getHudRegion(game.factory.ACT_DONE), game.factory.getHudRegion(game.factory.ACT_ABORT));
optionsBtn = new Bg(game.factory.getHudRegion(game.factory.ACT_OPTIONS));
optionsPanel = new OptionsPanel(game);
stats = new StatisticsPanel(game);
diff --git a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
index 15726aa..c4f4e8e 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java
@@ -44,7 +44,7 @@ public class EngagementPanel extends Patch implements Animation
public EngagementPanel(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.usFlag = new Bg(game.factory.getFlag(Army.US));
this.geFlag = new Bg(game.factory.getFlag(Army.GE));
this.attackImg = new Bg(game.factory.getHudRegion(game.factory.PNG_ATTACK));
diff --git a/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java b/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java
index 76ac97f..c97bb9a 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/ObjectivesPanel.java
@@ -20,7 +20,7 @@ public class ObjectivesPanel extends Patch
public ObjectivesPanel(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.title = new Label(game.font, LABEL_PADDING);
this.content = new Label(game.font, LABEL_PADDING);
this.visible = false;
diff --git a/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java
index e7a4377..5e004e6 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/OptionsPanel.java
@@ -37,7 +37,7 @@ public class OptionsPanel extends Patch
public OptionsPanel(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.game = game;
this.font = game.font;
this.title = new Label(game.font, LABEL_PADDING);
diff --git a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java
index 9b2746c..1711168 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/StatisticsPanel.java
@@ -28,7 +28,7 @@ public class StatisticsPanel extends Patch
public StatisticsPanel(RustAndDust game)
{
- super(game.ninePatch);
+ super(game.bgPatch);
this.title = new Label(game.font);
this.header = new Label(game.font);
this.stats1 = new Label(game.font);