diff options
| author | Zach Jordan <zxjordan5@gmail.com> | 2023-05-30 08:37:47 -0400 |
|---|---|---|
| committer | Zach Jordan <zxjordan5@gmail.com> | 2023-05-30 08:37:47 -0400 |
| commit | c502ba54d61edf9118f9667c37329a15a9359a3f (patch) | |
| tree | 23bba7d07aeb1f173bcbfb7b5a1c8ad9fe28e8f3 /src | |
| parent | b0d578a6861db0da03c7b3334acf65ed8497b973 (diff) | |
| parent | ed2ef7684446ead49db1e37ff7ab0e7066685673 (diff) | |
| download | NPEhero-c502ba54d61edf9118f9667c37329a15a9359a3f.tar.gz NPEhero-c502ba54d61edf9118f9667c37329a15a9359a3f.tar.bz2 NPEhero-c502ba54d61edf9118f9667c37329a15a9359a3f.zip | |
Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero
Diffstat (limited to 'src')
| -rw-r--r-- | src/gameplay/SongPlayer.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java index 9193210..67b21a4 100644 --- a/src/gameplay/SongPlayer.java +++ b/src/gameplay/SongPlayer.java @@ -7,6 +7,7 @@ import java.util.LinkedList; import java.util.Queue; import java.util.Scanner; +import gui.GameOver; import javafx.geometry.Pos; import javafx.scene.input.KeyCode; import javafx.scene.layout.HBox; @@ -29,6 +30,7 @@ import sound.AudioFilePlayer; // lvl.colors - array of colors (size 5) for the block colors // d.notes - File, notes.txt in the difficulty folder +// gui.Driver.setMenu(new GameOver(lvl, d, p, cntrl.getScore())); public class SongPlayer extends Pane { private int bpm; //initializes the bpm of the song, to be read in from a metadata file later |