From 643ce8a350bd266dd67d64a73acb5cf6a4e5b300 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 31 Mar 2021 10:08:55 -0700 Subject: [PATCH] bullshit for working mac build? lol --- Project.xml | 2 +- source/Discord.hx | 21 +++++++++++++-------- source/PlayState.hx | 2 ++ source/TitleState.hx | 6 +++--- source/ui/PreferencesMenu.hx | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Project.xml b/Project.xml index c6eb34e14..be1f2cbed 100644 --- a/Project.xml +++ b/Project.xml @@ -126,7 +126,7 @@ - + diff --git a/source/Discord.hx b/source/Discord.hx index 253a4f59a..c28e5d9be 100644 --- a/source/Discord.hx +++ b/source/Discord.hx @@ -1,12 +1,16 @@ package; import Sys.sleep; -import discord_rpc.DiscordRpc; using StringTools; +#if discord_rpc +import discord_rpc.DiscordRpc; +#end + class DiscordClient { + #if discord_rpc public function new() { trace("Discord Client starting..."); @@ -22,7 +26,7 @@ class DiscordClient { DiscordRpc.process(); sleep(2); - //trace("Discord Client Update"); + // trace("Discord Client Update"); } DiscordRpc.shutdown(); @@ -57,9 +61,9 @@ class DiscordClient trace("Discord Client initialized"); } - public static function changePresence(details:String, state:Null, ?smallImageKey : String, ?hasStartTimestamp : Bool, ?endTimestamp: Float) + public static function changePresence(details:String, state:Null, ?smallImageKey:String, ?hasStartTimestamp:Bool, ?endTimestamp:Float) { - var startTimestamp:Float = if(hasStartTimestamp) Date.now().getTime() else 0; + var startTimestamp:Float = if (hasStartTimestamp) Date.now().getTime() else 0; if (endTimestamp > 0) { @@ -71,12 +75,13 @@ class DiscordClient state: state, largeImageKey: 'icon', largeImageText: "Friday Night Funkin'", - smallImageKey : smallImageKey, + smallImageKey: smallImageKey, // Obtained times are in milliseconds so they are divided so Discord can use it - startTimestamp : Std.int(startTimestamp / 1000), - endTimestamp : Std.int(endTimestamp / 1000) + startTimestamp: Std.int(startTimestamp / 1000), + endTimestamp: Std.int(endTimestamp / 1000) }); - //trace('Discord RPC Updated. Arguments: $details, $state, $smallImageKey, $hasStartTimestamp, $endTimestamp'); + // trace('Discord RPC Updated. Arguments: $details, $state, $smallImageKey, $hasStartTimestamp, $endTimestamp'); } + #end } diff --git a/source/PlayState.hx b/source/PlayState.hx index f3bf44cca..ff27fd3d5 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -194,7 +194,9 @@ class PlayState extends MusicBeatState dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue')); } + #if discord_rpc initDiscord(); + #end switch (SONG.song.toLowerCase()) { diff --git a/source/TitleState.hx b/source/TitleState.hx index 552d63fba..f20080570 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -194,9 +194,9 @@ class TitleState extends MusicBeatState blackScreen = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK); credGroup.add(blackScreen); - var atlasBullShit:FlxSprite = new FlxSprite(); - atlasBullShit.frames = CoolUtil.fromAnimate(Paths.image('money'), Paths.file('images/money.json')); - credGroup.add(atlasBullShit); + // var atlasBullShit:FlxSprite = new FlxSprite(); + // atlasBullShit.frames = CoolUtil.fromAnimate(Paths.image('money'), Paths.file('images/money.json')); + // credGroup.add(atlasBullShit); credTextShit = new Alphabet(0, 0, "ninjamuffin99\nPhantomArcade\nkawaisprite\nevilsk8er", true); credTextShit.screenCenter(); diff --git a/source/ui/PreferencesMenu.hx b/source/ui/PreferencesMenu.hx index 128b729df..5e4cb8b85 100644 --- a/source/ui/PreferencesMenu.hx +++ b/source/ui/PreferencesMenu.hx @@ -35,7 +35,7 @@ class PreferencesMenu extends ui.OptionsState.Page public static function initPrefs():Void { preferenceCheck('censor-naughty', false); - preferenceCheck('downscroll', true); + preferenceCheck('downscroll', false); preferenceCheck('flashing-menu', true); preferenceCheck('camera-zoom', true); preferenceCheck('fps-counter', true);