Fix for MacOS and Linux (As usual xd)

Slushi-Github · Dec 31, 2024 · 37ae543 · 37ae543
1 parent de371c4
commit 37ae543
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/funkinscsource/slushi/states/freeplay/SlushiFreeplayState.hx b/funkinscsource/slushi/states/freeplay/SlushiFreeplayState.hx
@@ -289,9 +289,11 @@ class SlushiFreeplayState extends MusicBeatState
 		intendedColor = bg.color;
 		lerpSelected = curSelected;
 
+		#if windows
 		// Set the window border color from the current song's color
 		// Idea from VS Camellia ALT (https://gamebanana.com/mods/413258) (They use my code to set the window border color XD)
 		WindowsFuncs.setWindowBorderColorFromInt(intendedColor);
+		#end
 
 		curDifficulty = Math.round(Math.max(0, Difficulty.list.indexOf(lastDifficultyName)));
 
@@ -1039,10 +1041,12 @@ class SlushiFreeplayState extends MusicBeatState
 			FlxTween.cancelTweensOf(bg);
 			FlxTween.color(bg, 1, bg.color, intendedColor);
 
+			#if windows
 			// Set the window border color with a tween from the current song's color
 			// Idea from VS Camellia ALT (https://gamebanana.com/mods/413258) (They use my code to set the window border color XD)
 			WindowsFuncs.cancelWindowBorderColorTween();
 			WindowsFuncs.tweenWindowBorderColor(CustomFuncs.colorIntToRGB(bg.color), CustomFuncs.colorIntToRGB(intendedColor), 1, "linear");
+			#end
 		}
 
 		for (num => item in grpSongs.members)

diff --git a/funkinscsource/slushi/windows/winGDIThings/WinGDIThread.hx b/funkinscsource/slushi/windows/winGDIThings/WinGDIThread.hx
@@ -25,6 +25,7 @@ class WinGDIThread
 
 		mainThread = Thread.create(() ->
 		{
+			#if windows
 			Debug.logSLEInfo('Windows GDI Thread running...');
 			while (runningThread)
 			{
@@ -68,6 +69,7 @@ class WinGDIThread
 					gdi.gdiEffect.update();
 				}
 			}
+			#end
 		});
 	}
 

diff --git a/funkinscsource/states/freeplay/FreeplayState.hx b/funkinscsource/states/freeplay/FreeplayState.hx
@@ -269,10 +269,6 @@ class FreeplayState extends MusicBeatState
     intendedColor = bg.color;
     lerpSelected = curSelected;
 
-    // Set the window border color from the current song's color
-		// Idea from VS Camellia ALT (https://gamebanana.com/mods/413258) (They use my code to set the window border color XD)
-    WindowsFuncs.setWindowBorderColorFromInt(intendedColor);
-
     curDifficulty = Math.round(Math.max(0, Difficulty.list.indexOf(lastDifficultyName)));
 
     player = new MusicPlayer(this);
@@ -997,10 +993,6 @@ class FreeplayState extends MusicBeatState
     {
       intendedColor = newColor;
 
-      // Set the window border color from the current song's color
-		  // Idea from VS Camellia ALT (https://gamebanana.com/mods/413258) (They use my code to set the window border color XD)
-      WindowsFuncs.setWindowBorderColorFromInt(intendedColor);
-
       FlxTween.cancelTweensOf(bg);
       FlxTween.color(bg, 1, bg.color, intendedColor);
     }

diff --git a/funkinscsource/substates/GameOverSubstate.hx b/funkinscsource/substates/GameOverSubstate.hx
@@ -60,7 +60,9 @@ class GameOverSubstate extends MusicBeatSubState
   {
     instance = this;
 
+    #if windows
     WindowsFuncs.tweenWindowBorderColor([255, 0, 0], [0, 0, 0], 1, 'linear');
+    #end
 
     Conductor.songPosition = 0;
 
@@ -243,7 +245,9 @@ class GameOverSubstate extends MusicBeatSubState
     if (!isEnding)
     {
 
+      #if windows
       WindowsFuncs.tweenWindowBorderColor([185, 157, 0], CustomFuncs.colorIntToRGB(SlushiMain.slushiColor), 2, 'linear');
+      #end
 
       isEnding = true;
       if (boyfriend.hasOffsetAnimation('deathConfirm')) boyfriend.playAnim('deathConfirm', true);

diff --git a/funkinscsource/substates/vslice/ResultState.hx b/funkinscsource/substates/vslice/ResultState.hx
@@ -107,7 +107,10 @@ class ResultState extends MusicBeatSubState
 
     rankBg = new FunkinSCSprite(0, 0);
 
+    #if windows
+    // Set the window color to a nice color.
     WindowsFuncs.setWindowBorderColor([254, 199, 92]);
+    #end
   }
 
   override function create():Void