fixy fixy

JoaTH-Team · Jul 30, 2024 · 3837a6c · 3837a6c
1 parent 2c04fee
commit 3837a6c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Project.xml b/Project.xml
@@ -25,7 +25,8 @@
 	<haxelib name="flixel-addons" />
 	<haxelib name="flixel-ui" />
 
-	<haxelib name="funkin.vis"/>
+	<haxelib name="funkin.vis" />
+	<haxelib name="grig.audio" />
 
 	<haxelib name="hscript" />
 	<haxelib name="hxcpp-debug-server" if="desktop debug" />

diff --git a/compileData/haxelibs.json b/compileData/haxelibs.json
@@ -38,6 +38,13 @@
       "dir": null,
       "ref": "38261833590773cb1de34ac5d11e0825696fc340",
       "url": "https://github.com/FunkinCrew/funkVis"
+    },
+    {
+      "name": "grig.audio",
+      "type": "git",
+      "dir": "src",
+      "ref": "57f5d47f2533fd0c3dcd025a86cb86c0dfa0b6d2",
+      "url": "https://gitlab.com/haxe-grig/grig.audio.git"
     }
   ]
 }
diff --git a/source/game/CustomBackdrop.hx b/source/game/CustomBackdrop.hx
@@ -5,8 +5,8 @@ class CustomBackdrop extends FlxBackdrop {
 	private var oscillationAmplitude:Float;
 	private var initialY:Float;
 
-	public function new(graphic:Dynamic, repeatX:Bool = true, repeatY:Bool = true, scrollX:Float = 1, scrollY:Float = 1) {
-		super(graphic, repeatX, repeatY, scrollX, scrollY);
+	public function new(graphic:Dynamic) {
+		super(graphic);
 		oscillationSpeed = 1;
 		oscillationAmplitude = 20;
 		initialY = y;

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -76,8 +76,10 @@ class PlayState extends ExtendableState {
 		bg.screenCenter(XY);
 		add(bg);
 
+		/*
         var audio:AudioDisplay = new AudioDisplay(FlxG.sound.music, 0, FlxG.height, FlxG.width, FlxG.height, 200, FlxColor.WHITE);
         add(audio);
+		*/
 
 		strumline = new FlxTypedGroup<Note>();
 		add(strumline);
@@ -374,7 +376,7 @@ class PlayState extends ExtendableState {
 			return false;
 		}
 		ExtendableState.switchState(new SongSelectState());
-		// FlxG.sound.playMusic(Paths.music('Rhythmic_Odyssey'));
+		FlxG.sound.playMusic(Paths.music('Basically_Professionally_Musically'));
 		HighScore.saveScore(song.song, score);
 		canPause = false;
 		return true;