summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-18 11:10:21 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-18 11:10:21 +0100
commitcb81f0a8a194ceebaea880f9027635e6a27df69e (patch)
treea64e55aaa5f45d8329737af6633a6d3fe9f3a3ff /core/src/ch/asynk/rustanddust/game
parent75ff89304eaf9052ab889bb7ec81c96de4fa7908 (diff)
downloadRustAndDust-cb81f0a8a194ceebaea880f9027635e6a27df69e.zip
RustAndDust-cb81f0a8a194ceebaea880f9027635e6a27df69e.tar.gz
UI: merge menu and ui assets, AtlasRegion are known and provided by RustAndDust
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Hud.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java
index bd2d600..a60d125 100644
--- a/core/src/ch/asynk/rustanddust/game/Hud.java
+++ b/core/src/ch/asynk/rustanddust/game/Hud.java
@@ -65,8 +65,8 @@ public class Hud implements Disposable, Animation
playerInfo = new PlayerInfo(ctrl, game.font, game.uiAtlas, hudAtlas);
actionButtons = new ActionButtons(ctrl, game.uiAtlas, hudAtlas);
actionButtons.hide();
- msg = new Msg(game.font, game.uiAtlas);
- okCancel = new OkCancel(game.font, game.uiAtlas);
+ msg = new Msg(game.font, game.ninePatch, 20f);
+ okCancel = new OkCancel(game.font, game.ninePatch, game.getUiRegion(game.UI_OK), game.getUiRegion(game.UI_CANCEL));
stats = new StatisticsPanel(game.font, game.uiAtlas, hudAtlas);
engagement = new EngagementPanel(game.font, game.uiAtlas, hudAtlas);
}