From 63e763731a021b0493520fe3abbcb40dff9db0a4 Mon Sep 17 00:00:00 2001
From: Jonathan Hager <jonathan.hager@protonmail.com>
Date: Sat, 25 Apr 2020 11:29:58 +0200
Subject: [PATCH] Volume implementiert

---
 core/src/com/dungeoncrawler/control/Controller.java | 7 +++++--
 core/src/com/dungeoncrawler/view/GameScreen.java    | 3 ++-
 core/src/com/dungeoncrawler/view/MainMenu.java      | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java
index 0ce5f41..e66af8c 100644
--- a/core/src/com/dungeoncrawler/control/Controller.java
+++ b/core/src/com/dungeoncrawler/control/Controller.java
@@ -37,6 +37,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     int level;
     int roomX;
     int roomY;
+    float volume;
     
     Entity[] arrows;
     
@@ -50,12 +51,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
     @Override
     public void create(){
         
+        volume = 10f;
+        
         arrows = new Entity[10];
         roomX = 8;
         roomY = 6;
         
         batch = new SpriteBatch();
-        v = new MainMenu();
+        v = new MainMenu(volume);
         dg = new DungeonGenerator();
         
         
@@ -359,7 +362,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
               case 0:
                   v.cleanUp();
                   v = null;
-                  m = new GameScreen(d);
+                  m = new GameScreen(d, volume);
                   return true;
               case 1:
                   
diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java
index eaf932c..c78e253 100644
--- a/core/src/com/dungeoncrawler/view/GameScreen.java
+++ b/core/src/com/dungeoncrawler/view/GameScreen.java
@@ -50,7 +50,7 @@ public class GameScreen {
         // Sound
         Music music;
         
-	public GameScreen(Dungeon d) {
+	public GameScreen(Dungeon d, float volume) {
                 //CONTROLS
                     ctr = new Texture("controls.png");
                     controls = new Sprite(ctr);
@@ -93,6 +93,7 @@ public class GameScreen {
                 tmr = new OrthogonalTiledMapRenderer(tm);
                 
                 music = Gdx.audio.newMusic(Gdx.files.internal("gamemusic.mp3"));
+                music.setVolume(volume);
                 music.play();
 
 	}
diff --git a/core/src/com/dungeoncrawler/view/MainMenu.java b/core/src/com/dungeoncrawler/view/MainMenu.java
index f3f3240..b250b09 100644
--- a/core/src/com/dungeoncrawler/view/MainMenu.java
+++ b/core/src/com/dungeoncrawler/view/MainMenu.java
@@ -28,7 +28,7 @@ public class MainMenu{
         // Sound
         Music music;
         
-	public MainMenu() {
+	public MainMenu(float volume) {
                 //MENU-SCREEN
                 float w = Gdx.graphics.getWidth();
                 float h = Gdx.graphics.getHeight();
@@ -65,6 +65,7 @@ public class MainMenu{
                 
                 // Sound
                 music = Gdx.audio.newMusic(Gdx.files.internal("mainmenu.mp3"));
+                music.setVolume(volume);
                 music.play();
 	}