Merge pull request #1752 from KadeDev/master

fix linux compile again
This commit is contained in:
Kade M 2021-08-14 13:59:53 -07:00 committed by GitHub
commit 68d2d7d99a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -69,7 +69,7 @@ import lime.utils.Assets;
import openfl.display.BlendMode; import openfl.display.BlendMode;
import openfl.display.StageQuality; import openfl.display.StageQuality;
import openfl.filters.ShaderFilter; import openfl.filters.ShaderFilter;
#if cpp #if windows
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
#if cpp #if cpp
@ -2109,7 +2109,7 @@ class PlayState extends MusicBeatState
vocals.pause(); vocals.pause();
} }
#if cpp #if windows
DiscordClient.changePresence("PAUSED on " DiscordClient.changePresence("PAUSED on "
+ SONG.song + SONG.song
+ " (" + " ("
@ -2143,7 +2143,7 @@ class PlayState extends MusicBeatState
startTimer.active = true; startTimer.active = true;
paused = false; paused = false;
#if cpp #if windows
if (startTimer.finished) if (startTimer.finished)
{ {
DiscordClient.changePresence(detailsText DiscordClient.changePresence(detailsText
@ -2181,7 +2181,7 @@ class PlayState extends MusicBeatState
vocals.time = Conductor.songPosition; vocals.time = Conductor.songPosition;
vocals.play(); vocals.play();
#if cpp #if windows
DiscordClient.changePresence(detailsText DiscordClient.changePresence(detailsText
+ " " + " "
+ SONG.song + SONG.song
@ -2429,7 +2429,7 @@ class PlayState extends MusicBeatState
removedVideo = true; removedVideo = true;
} }
cannotDie = true; cannotDie = true;
#if cpp #if windows
DiscordClient.changePresence("Chart Editor", null, null, true); DiscordClient.changePresence("Chart Editor", null, null, true);
#end #end
@ -2853,7 +2853,7 @@ class PlayState extends MusicBeatState
openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
#if cpp #if windows
// 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 -- " DiscordClient.changePresence("GAME OVER -- "
+ SONG.song + SONG.song
@ -2889,7 +2889,7 @@ class PlayState extends MusicBeatState
openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
#if cpp #if windows
// 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 -- " DiscordClient.changePresence("GAME OVER -- "
+ SONG.song + SONG.song