more mac\linux fixes

Author: Z11Coding

source/Main.hx

@@ -124,10 +124,12 @@ class Main extends Sprite
 		hxvlc.util.Handle.init(#if (hxvlc >= "1.8.0")  ['--no-lua'] #end);
 		#end
 
+		#if windows
 		backend.window.CppAPI._setWindowLayered();
 		backend.window.CppAPI.darkMode();
 		backend.window.CppAPI.allowHighDPI();
 		backend.window.CppAPI.setOld();
+		#end
 		Toolkit.init();
 		Toolkit.theme = 'dark'; // don't be cringe
 		backend.Cursor.registerHaxeUICursors();

source/archipelago/APPlayState.hx

@@ -78,7 +78,7 @@ class APPlayState extends PlayState {
 	public var effectArray:Array<String> = [
 		'colorblind', 'blur', 'lag', 'mine', 'warning', 'heal', 'spin', 'songslower', 'songfaster', 'scrollswitch', 'scrollfaster', 'scrollslower', 'rainbow',
 		'cover', 'ghost', 'flashbang', 'nostrum', 'jackspam', 'spam', 'sever', 'shake', 'poison', 'dizzy', 'noise', 'flip', 'invuln',
-		'desync', 'mute', 'ice', 'randomize', 'randomizeAlt', 'opponentPlay', 'bothplay', 'fakeheal', 'spell', 'terminate', 'lowpass', 'notif'
+		'desync', 'mute', 'ice', 'randomize', 'randomizeAlt', 'opponentPlay', 'bothplay', 'fakeheal', 'spell', 'terminate', 'lowpass', #if windows 'notif' #end
 	];
 	var notifs:Array<String> = [
 		"You're crazy...",
@@ -361,7 +361,7 @@ class APPlayState extends PlayState {
                 applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, alwaysEnd, 'scrollfaster');
             },
             'notif' => function() {
-                backend.window.CppAPI.sendWindowsNotification("Archipelago", notifs[FlxG.random.int(0, notifs.length-1)]);
+                #if windows backend.window.CppAPI.sendWindowsNotification("Archipelago", notifs[FlxG.random.int(0, notifs.length-1)]); #end
             },
             'scrollslower' => function() {
                 var changeAmount:Float = FlxG.random.float(0.1, 0.9);

source/backend/MusicBeatState.hx

@@ -55,6 +55,7 @@ class MusicBeatState extends FlxState
 		super.create();
 
 		// if (backend.window.CppAPI.getWindowOpacity()!=1)
+		#if windows
 		if (emergencyOpacityFix) {
 			CppAPI.setWindowOppacity(1);
 		}
@@ -74,6 +75,7 @@ class MusicBeatState extends FlxState
 				CppAPI.setWindowOpacity(num);
 			});
 		}
+		#end
 
 		if (!skip)
 		{

source/backend/TransitionState.hx

@@ -246,6 +246,7 @@ class TransitionState {
             case "instant":
                 switchState(targetState, onComplete, args);
             case 'transparent fade':
+                #if windows
                 FlxTween.num(1, 0, 2, {ease: FlxEase.sineInOut, onComplete: 
                 function(twn:FlxTween)
                 {
@@ -255,6 +256,7 @@ class TransitionState {
                 {
                     CppAPI.setWindowOppacity(num);
                 });
+                #end
             case 'transparent close':
                 if (FlxG.sound.music != null && FlxG.sound.music.playing)
                 {
@@ -266,6 +268,7 @@ class TransitionState {
                     FlxG.sound.play(Paths.music('gameOverEnd'));
                 }
                 if (ClientPrefs.data.flashing) FlxG.camera.flash(FlxColor.WHITE, 2);
+                #if windows
                 FlxTween.num(1, 0, 2, {ease: FlxEase.sineInOut, onComplete: 
                 function(twn:FlxTween)
                 {
@@ -275,6 +278,7 @@ class TransitionState {
                 {
                     CppAPI.setWindowOppacity(num);
                 });
+                #end
         }
         //trace("Transition complete!");
     }
@@ -323,7 +327,7 @@ class TransitionState {
                     }
                 });
             case "transparent fade":
-				CppAPI.setWindowOppacity(1);
+				#if windows CppAPI.setWindowOppacity(1); #end
 				trace("Post-switch transparent fade complete.");
             default:
                 trace("Unknown post-switch transition type: " + transitionType);
@@ -479,6 +483,7 @@ class TransitionState {
                 processNextObject();
             case 'transparent fade':
                 MusicBeatState.emergencyOpacityFix = true;    
+                #if windows
                 FlxTween.num(1, 0, 2, {ease: FlxEase.sineInOut, onComplete: 
                 function(twn:FlxTween)
                 {
@@ -489,6 +494,7 @@ class TransitionState {
                 {
                     CppAPI.setWindowOppacity(num);
                 });
+                #end
             case 'transparent close': var psPause = states.PlayState.instance?.paused;
                 if (FlxG.sound.music != null && FlxG.sound.music.playing)
                 {
@@ -508,6 +514,7 @@ class TransitionState {
                 }
                 MusicBeatState.emergencyOpacityFix = true;
                 if (ClientPrefs.data.flashing) FlxG.camera.flash(FlxColor.WHITE, 2);
+                #if windows
                 FlxTween.num(1, 0, 2, {ease: FlxEase.sineInOut, onComplete: 
                 function(twn:FlxTween)
                 {
@@ -524,6 +531,7 @@ class TransitionState {
                 {
                     CppAPI.setWindowOppacity(num);
                 });
+                #end
         }
     }
 

source/stages/Desktop.hx

@@ -14,28 +14,34 @@ class Desktop extends BaseStage
         bg.makeGraphic(FlxG.width, FlxG.height, 0xff000000);
         add(bg);
 
+        #if windows 
         CppAPI.setTransparency("Mixtape Engine", 0xff000000);
         if (!FlxG.fullscreen)
         {
             FlxG.fullscreen = true;
         }
+        #end
 
         super.create();
     }
 
     override function update(elapsed:Float)
     {
+        #if windows
         if (!FlxG.fullscreen)
-            {
-                FlxG.fullscreen = true;
-            }
+        {
+            FlxG.fullscreen = true;
+        }
+        #end
         super.update(elapsed);
     }
 
     override function destroy()
     {
+        #if windows
         CppAPI.setTransparency("Mixtape Engine", 0x00000001);
         FlxG.fullscreen = wasFullscreen;
+        #end
         super.destroy();
     }
 }

source/states/FreeplayState.hx

@@ -128,8 +128,10 @@ class FreeplayState extends MusicBeatState
 	var ticketCounter:FlxText = null;
 	override function create()
 	{
+		#if windows
 		backend.window.CppAPI.resetAffixes();
 		backend.window.CppAPI.resetTitle();
+		#end
 		Cursor.cursorMode = Default;
 		instance = this; // For Archipelago
 

source/states/PlayState.hx

@@ -732,8 +732,10 @@ class PlayState extends MusicBeatState
 				new MallXmasErect(); // Week 5 Special
 			case 'phillyStreetsErect':
 				new PhillyStreetsErect(); // Weekend 1 Special
+			#if windows 
 			case 'desktop':
 				new Desktop(); // Literally your desktop as a stage lmao
+			#end
 		}
 		if (isPixelStage) introSoundsSuffix = '-pixel';