null + macro things?

2024-08-20 07:25:59 +00:00 · 2023-12-07 14:29:45 -05:00 · 2023-12-07 14:29:45 -05:00 · 554c7bb31d
parent 8ef380e0b2
commit 554c7bb31d
4 changed files with 7 additions and 1 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit d2a2327bb1eb04a1aa07d7340201f42217829005
+Subproject commit 830127dcc38e4f0fc35b162bd0f696a77679b046
--- a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
+++ b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
@ -139,6 +139,8 @@ class ChartEditorNotificationHandler

    return notif;
    #else
+    // TODO: Implement notifications on Mac OS OR... make sure the null is handled properly on mac?
+    return null;
    trace('WARNING: Notifications are not supported on Mac OS.');
    #end
  }
--- a/source/funkin/util/macro/FlxMacro.hx
+++ b/source/funkin/util/macro/FlxMacro.hx
@ -1,5 +1,6 @@
 package funkin.util.macro;

+#if !display
 #if macro
 class FlxMacro
 {
@ -33,3 +34,4 @@ class FlxMacro
  }
 }
 #end
+#end
--- a/source/funkin/util/macro/GitCommit.hx
+++ b/source/funkin/util/macro/GitCommit.hx
@ -1,5 +1,6 @@
 package funkin.util.macro;

+#if !display
 #if (debug || FORCE_DEBUG_VERSION)
 class GitCommit
 {
@ -65,3 +66,4 @@ class GitCommit
  }
 }
 #end
+#end