diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index ebaae7a..02000c5 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -305,6 +305,28 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ d.getLevel()[level].getRooms()[posRoom[0]][posRoom[1]].setEnemies(m.playerAttack(e, d.getPlayer())); } } + + if(keycode == Input.Keys.UP){ + volume += 0.1f; + + if(v != null){ + v.music.setVolume(volume); + } + if(m != null){ + m.music.setVolume(volume); + } + } + + if(keycode == Input.Keys.DOWN){ + volume -= 0.1f; + + if(v != null){ + v.music.setVolume(volume); + } + if(m != null){ + m.music.setVolume(volume); + } + } return true; } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 42753d2..80d7512 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -48,7 +48,7 @@ public class GameScreen { OrthographicCamera camera; // Sound - Music music; + public Music music; public GameScreen(Dungeon d, float volume) { //CONTROLS diff --git a/core/src/com/dungeoncrawler/view/MainMenu.java b/core/src/com/dungeoncrawler/view/MainMenu.java index b250b09..1c133d7 100644 --- a/core/src/com/dungeoncrawler/view/MainMenu.java +++ b/core/src/com/dungeoncrawler/view/MainMenu.java @@ -26,7 +26,7 @@ public class MainMenu{ OrthographicCamera camera; // Sound - Music music; + public Music music; public MainMenu(float volume) { //MENU-SCREEN