aboutsummaryrefslogtreecommitdiff
path: root/src/gameplay/Timer.java
diff options
context:
space:
mode:
authorZach Jordan <zxjordan5@gmail.com>2023-06-02 08:14:35 -0400
committerZach Jordan <zxjordan5@gmail.com>2023-06-02 08:14:35 -0400
commit408c42dc788a7d9c218071dea34843b4196fa7c8 (patch)
tree6a24298db96c1bec42d9720cc52b85451f896aab /src/gameplay/Timer.java
parentb3306178c75bec60e0842285d20a816b318dba66 (diff)
parenta0739dc019417f17e77f6c959ebc0989c873514c (diff)
downloadNPEhero-408c42dc788a7d9c218071dea34843b4196fa7c8.tar.gz
NPEhero-408c42dc788a7d9c218071dea34843b4196fa7c8.tar.bz2
NPEhero-408c42dc788a7d9c218071dea34843b4196fa7c8.zip
Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero
Diffstat (limited to 'src/gameplay/Timer.java')
-rw-r--r--src/gameplay/Timer.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gameplay/Timer.java b/src/gameplay/Timer.java
index 4ffb1fb..5ff3b16 100644
--- a/src/gameplay/Timer.java
+++ b/src/gameplay/Timer.java
@@ -21,4 +21,8 @@ public class Timer
public double time() {
return ((double)(System.currentTimeMillis()-timeStart))*(bpm/60000.0);
}
+
+ public String toString() {
+ return ""+((double)(System.currentTimeMillis()-timeStart))*(bpm/60000.0);
+ }
}