summaryrefslogtreecommitdiffstats
path: root/core/src/ch
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-08 14:43:09 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-08 14:43:09 +0100
commitd592633b2f9dcf00ca8851d7d4a91147b0866fef (patch)
treee61fb0b2a7fcc4490f93deac3c2e1d553416bf16 /core/src/ch
parent0844a815e5faa33c2fa9f4cd802f73aecbd3c075 (diff)
downloadRustAndDust-d592633b2f9dcf00ca8851d7d4a91147b0866fef.zip
RustAndDust-d592633b2f9dcf00ca8851d7d4a91147b0866fef.tar.gz
Hud: engagementSummary() gets fxVolume frome game.config
Diffstat (limited to 'core/src/ch')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Hud.java4
-rw-r--r--core/src/ch/asynk/rustanddust/game/Map.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java
index 8dae202..7c3ff2e 100644
--- a/core/src/ch/asynk/rustanddust/game/Hud.java
+++ b/core/src/ch/asynk/rustanddust/game/Hud.java
@@ -298,9 +298,9 @@ public class Hud implements Disposable, Animation
pushDialog(okCancel);
}
- public void engagementSummary(Engagement e, float volume)
+ public void engagementSummary(Engagement e)
{
- engagement.show(e, Position.BOTTOM_CENTER, volume);
+ engagement.show(e, Position.BOTTOM_CENTER, game.config.fxVolume);
pushDialog(engagement);
}
diff --git a/core/src/ch/asynk/rustanddust/game/Map.java b/core/src/ch/asynk/rustanddust/game/Map.java
index 5e27a1a..ecb24d0 100644
--- a/core/src/ch/asynk/rustanddust/game/Map.java
+++ b/core/src/ch/asynk/rustanddust/game/Map.java
@@ -515,7 +515,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS
addAnimation(destroy);
}
- ctrl.hud.engagementSummary(e, ctrl.cfg.fxVolume);
+ ctrl.hud.engagementSummary(e);
addEngagementAnimation(e.defender);
if (engagementCost(e) == 0)