cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-27 17:33:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1 from ninjamuffin99/sans_discord

Browse source 
allow run without discord stuff
This commit is contained in:
Cameron Taylor 2021-03-29 13:43:10 -07:00 committed by GitHub
parent bdb74d29bc c5888e44ed
commit c0cfbc3380
6 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Project.xml
View file

@ -126,7 +126,7 @@
<haxelib name="faxe" if='switch'/> <haxelib name="faxe" if='switch'/>
<haxelib name="polymod"/> <haxelib name="polymod"/>
<haxelib name="hxcpp-debug-server" if="desktop debug"/> <haxelib name="hxcpp-debug-server" if="desktop debug"/>
<haxelib name="discord_rpc" if="desktop"/> <haxelib name="discord_rpc" if="cpp"/> <!-- foesn't work with neko -->
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> --> <!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
<!-- <haxelib name="markdown" /> --> <!-- <haxelib name="markdown" /> -->

5
source/FreeplayState.hx
View file

@ -1,6 +1,5 @@
package; package;
#if discord_rpc
#if desktop
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
import flash.text.TextField; import flash.text.TextField;
@ -52,7 +51,7 @@ class FreeplayState extends MusicBeatState
FlxG.sound.playMusic(Paths.music('freakyMenu')); FlxG.sound.playMusic(Paths.music('freakyMenu'));
} }
#if desktop #if discord_rpc
// Updating Discord Rich Presence // Updating Discord Rich Presence
DiscordClient.changePresence("In the Menus", null); DiscordClient.changePresence("In the Menus", null);
#end #end

2
source/MainMenuState.hx
View file

@ -41,7 +41,7 @@ class MainMenuState extends MusicBeatState
override function create() override function create()
{ {
#if desktop #if discord_rpc
// Updating Discord Rich Presence // Updating Discord Rich Presence
DiscordClient.changePresence("In the Menus", null); DiscordClient.changePresence("In the Menus", null);
#end #end

22
source/PlayState.hx
View file

@ -43,7 +43,7 @@ import ui.PreferencesMenu;
using StringTools; using StringTools;
#if desktop #if discord_rpc
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
@ -134,7 +134,7 @@ class PlayState extends MusicBeatState
var inCutscene:Bool = false; var inCutscene:Bool = false;
#if desktop #if discord_rpc
// Discord RPC variables // Discord RPC variables
var storyDifficultyText:String = ""; var storyDifficultyText:String = "";
var iconRPC:String = ""; var iconRPC:String = "";
@ -833,7 +833,7 @@ class PlayState extends MusicBeatState
function initDiscord():Void function initDiscord():Void
{ {
#if desktop #if discord_rpc
storyDifficultyText = CoolUtil.difficultyString(); storyDifficultyText = CoolUtil.difficultyString();
iconRPC = SONG.player2; iconRPC = SONG.player2;
@ -1073,7 +1073,7 @@ class PlayState extends MusicBeatState
FlxG.sound.music.onComplete = endSong; FlxG.sound.music.onComplete = endSong;
vocals.play(); vocals.play();
#if desktop #if discord_rpc
// Song duration in a float, useful for the time left feature // Song duration in a float, useful for the time left feature
songLength = FlxG.sound.music.length; songLength = FlxG.sound.music.length;
@ -1324,7 +1324,7 @@ class PlayState extends MusicBeatState
startTimer.active = true; startTimer.active = true;
paused = false; paused = false;
#if desktop #if discord_rpc
if (startTimer.finished) if (startTimer.finished)
{ {
DiscordClient.changePresence(detailsText, SONG.song + " (" + storyDifficultyText + ")", iconRPC, true, songLength - Conductor.songPosition); DiscordClient.changePresence(detailsText, SONG.song + " (" + storyDifficultyText + ")", iconRPC, true, songLength - Conductor.songPosition);
@ -1339,9 +1339,9 @@ class PlayState extends MusicBeatState
super.closeSubState(); super.closeSubState();
} }
#if discord_rpc
override public function onFocus():Void override public function onFocus():Void
{ {
#if desktop
if (health > 0 && !paused) if (health > 0 && !paused)
{ {
if (Conductor.songPosition > 0.0) if (Conductor.songPosition > 0.0)
@ -1353,22 +1353,20 @@ class PlayState extends MusicBeatState
DiscordClient.changePresence(detailsText, SONG.song + " (" + storyDifficultyText + ")", iconRPC); DiscordClient.changePresence(detailsText, SONG.song + " (" + storyDifficultyText + ")", iconRPC);
} }
} }
#end
super.onFocus(); super.onFocus();
} }
override public function onFocusLost():Void override public function onFocusLost():Void
{ {
#if desktop
if (health > 0 && !paused) if (health > 0 && !paused)
{ {
DiscordClient.changePresence(detailsPausedText, SONG.song + " (" + storyDifficultyText + ")", iconRPC); DiscordClient.changePresence(detailsPausedText, SONG.song + " (" + storyDifficultyText + ")", iconRPC);
} }
#end
super.onFocusLost(); super.onFocusLost();
} }
#end
function resyncVocals():Void function resyncVocals():Void
{ {
@ -1470,7 +1468,7 @@ class PlayState extends MusicBeatState
boyfriendPos.put(); boyfriendPos.put();
} }
#if desktop #if discord_rpc
DiscordClient.changePresence(detailsPausedText, SONG.song + " (" + storyDifficultyText + ")", iconRPC); DiscordClient.changePresence(detailsPausedText, SONG.song + " (" + storyDifficultyText + ")", iconRPC);
#end #end
} }
@ -1479,7 +1477,7 @@ class PlayState extends MusicBeatState
{ {
FlxG.switchState(new ChartingState()); FlxG.switchState(new ChartingState());
#if desktop #if discord_rpc
DiscordClient.changePresence("Chart Editor", null, null, true); DiscordClient.changePresence("Chart Editor", null, null, true);
#end #end
} }
@ -1598,7 +1596,7 @@ class PlayState extends MusicBeatState
// FlxG.switchState(new GameOverState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); // FlxG.switchState(new GameOverState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
#if desktop #if discord_rpc
// Game Over doesn't get his own variable because it's only used here // Game Over doesn't get his own variable because it's only used here
DiscordClient.changePresence("Game Over - " + detailsText, SONG.song + " (" + storyDifficultyText + ")", iconRPC); DiscordClient.changePresence("Game Over - " + detailsText, SONG.song + " (" + storyDifficultyText + ")", iconRPC);
#end #end

4
source/StoryMenuState.hx
View file

@ -1,6 +1,6 @@
package; package;
#if desktop #if discord_rpc
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
import flixel.FlxG; import flixel.FlxG;
@ -113,7 +113,7 @@ class StoryMenuState extends MusicBeatState
trace("Line 70"); trace("Line 70");
#if desktop #if discord_rpc
// Updating Discord Rich Presence // Updating Discord Rich Presence
DiscordClient.changePresence("In the Menus", null); DiscordClient.changePresence("In the Menus", null);
#end #end

6
source/TitleState.hx
View file

@ -21,8 +21,10 @@ import ui.PreferencesMenu;
using StringTools; using StringTools;
#if desktop #if discord_rpc
import Discord.DiscordClient; import Discord.DiscordClient;
#end
#if desktop
import sys.thread.Thread; import sys.thread.Thread;
#end #end
@ -95,7 +97,7 @@ class TitleState extends MusicBeatState
}); });
#end #end
#if desktop #if discord_rpc
DiscordClient.initialize(); DiscordClient.initialize();
#end #end
} }