Skip to content

Commit

Permalink
oops!
Browse files Browse the repository at this point in the history
the engine watermark was incorrectly positioned for the JSE one. it should be fixed now
  • Loading branch information
JordanSantiagoYT committed Nov 10, 2024
1 parent b41eb74 commit a058c88
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,7 @@ class PlayState extends MusicBeatState
EngineWatermark.text = "JS Engine v" + MainMenuState.psychEngineJSVersion;
EngineWatermark.x = FlxG.width - EngineWatermark.width - 5;
case 'JS Engine':
if (!ClientPrefs.downScroll) EngineWatermark.y = FlxG.height * 0.1 + 50;
if (!ClientPrefs.downScroll) EngineWatermark.y = FlxG.height * 0.1 - 70;
EngineWatermark.text = "Playing " + SONG.song + " on " + CoolUtil.difficultyString() + " - JSE v" + MainMenuState.psychEngineJSVersion;
case 'Dave Engine':
EngineWatermark.setFormat(Paths.font("comic.ttf"), 16, FlxColor.WHITE, RIGHT, OUTLINE,FlxColor.BLACK);
Expand Down Expand Up @@ -1532,7 +1532,7 @@ class PlayState extends MusicBeatState
iconP2.cameras = [camHUD];
if (EngineWatermark != null) EngineWatermark.cameras = [camHUD];
judgementCounter.cameras = [camHUD];
scoreTxt.cameras = [camHUD];
if (scoreTxt != null) scoreTxt.cameras = [camHUD];
if (botplayTxt != null) botplayTxt.cameras = [camHUD];
timeBar.cameras = [camHUD];
timeBarBG.cameras = [camHUD];
Expand Down Expand Up @@ -4965,8 +4965,15 @@ class PlayState extends MusicBeatState
if (ClientPrefs.songLoading) FlxG.sound.music.volume = 0;
if (ClientPrefs.songLoading) vocals.volume = opponentVocals.volume = 0;

FlxTransitionableState.skipNextTransOut = noTrans;
FlxG.resetState();
if(noTrans)
{
FlxTransitionableState.skipNextTransOut = true;
FlxG.resetState();
}
else
{
FlxG.resetState();
}
}

public var totalPlayed:Int = 0;
Expand Down

0 comments on commit a058c88

Please sign in to comment.