aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorsowgro <tpoke.ferrari@gmail.com>2023-05-30 08:39:07 -0400
committersowgro <tpoke.ferrari@gmail.com>2023-05-30 08:39:07 -0400
commit0795c44d8e523bfd96671576f70d67d6184a1ede (patch)
tree671c6530147184c0b9c57b62dc93a3a5f20eb66b /src/main
parented2ef7684446ead49db1e37ff7ab0e7066685673 (diff)
downloadNPEhero-0795c44d8e523bfd96671576f70d67d6184a1ede.tar.gz
NPEhero-0795c44d8e523bfd96671576f70d67d6184a1ede.tar.bz2
NPEhero-0795c44d8e523bfd96671576f70d67d6184a1ede.zip
added music to file reader
Diffstat (limited to 'src/main')
-rw-r--r--src/main/Difficulty.java2
-rw-r--r--src/main/LevelController.java4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/main/Difficulty.java b/src/main/Difficulty.java
index 7955698..24480e4 100644
--- a/src/main/Difficulty.java
+++ b/src/main/Difficulty.java
@@ -11,6 +11,8 @@ public class Difficulty
private ObservableList<LeaderboardEntry> leaderboard = FXCollections.observableArrayList();
public File notes;
public int bpm;
+ public File song;
+ public int numBeats;
public void parseMetadata(File file) {
//hi zach put json reader stuff here
diff --git a/src/main/LevelController.java b/src/main/LevelController.java
index f4d7587..faa5bf4 100644
--- a/src/main/LevelController.java
+++ b/src/main/LevelController.java
@@ -33,6 +33,10 @@ public class LevelController
{
diff.notes = curFileInCurDiff;
}
+ if (curFileInCurDiff.getName().equals("song.wav"))
+ {
+ diff.song = curFileInCurDiff;
+ }
}
level.diffList.add(diff);
}