diff --git a/src/main/java/seng302/controllers/LobbyController.java b/src/main/java/seng302/controllers/LobbyController.java index 81ba9e9a..56c38e37 100644 --- a/src/main/java/seng302/controllers/LobbyController.java +++ b/src/main/java/seng302/controllers/LobbyController.java @@ -196,29 +196,12 @@ public class LobbyController implements Initializable, Observer{ @FXML public void readyButtonPressed() { // setContentPane("/views/RaceView.fxml"); -// playTheme(); GameState.setCurrentStage(GameStages.RACING); mainServerThread.startGame(); } -// private static MediaPlayer mediaPlayer; -// -// private void playTheme() { -// Random random = new Random(System.currentTimeMillis()); -// Integer rand = random.nextInt(); -// if(rand == 10) { -// URL file = getClass().getResource("/music/Disturbed - down with the sickness.mp3"); -// Media hit = new Media(file.toString()); -// mediaPlayer = new MediaPlayer(hit); -// mediaPlayer.play(); -// } else if(rand == 9) { -// URL file = getClass().getResource("/music/Owl City - Fireflies.mp3"); -// Media hit = new Media(file.toString()); -// mediaPlayer = new MediaPlayer(hit); -// mediaPlayer.play(); -// } -// } + private void switchToRaceView() { if (!switchedPane) { diff --git a/src/main/resources/music/Disturbed - down with the sickness.mp3 b/src/main/resources/music/Disturbed - down with the sickness.mp3 deleted file mode 100644 index 375b140b..00000000 Binary files a/src/main/resources/music/Disturbed - down with the sickness.mp3 and /dev/null differ diff --git a/src/main/resources/music/Owl City - Fireflies.mp3 b/src/main/resources/music/Owl City - Fireflies.mp3 deleted file mode 100644 index fce20269..00000000 Binary files a/src/main/resources/music/Owl City - Fireflies.mp3 and /dev/null differ