From 554c7bb31dc35ea5143d1ccb9709b3edd4bb6c0b Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Thu, 7 Dec 2023 14:29:45 -0500
Subject: [PATCH] null + macro things?
---
assets | 2 +-
.../debug/charting/handlers/ChartEditorNotificationHandler.hx | 2 ++
source/funkin/util/macro/FlxMacro.hx | 2 ++
source/funkin/util/macro/GitCommit.hx | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/assets b/assets
index d2a2327bb..830127dcc 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit d2a2327bb1eb04a1aa07d7340201f42217829005
+Subproject commit 830127dcc38e4f0fc35b162bd0f696a77679b046
diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorNotificationHandler.hx
index a81b704b7..5c340feb7 100644
--- 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
}
diff --git a/source/funkin/util/macro/FlxMacro.hx b/source/funkin/util/macro/FlxMacro.hx
index 0c1a5fa78..cec6b72ec 100644
--- 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
diff --git a/source/funkin/util/macro/GitCommit.hx b/source/funkin/util/macro/GitCommit.hx
index d0c034828..b3ddd2b7e 100644
--- 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