From 4384b4c091585fd43efeac7d17d536b7eb82848a Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Fri, 10 Nov 2023 22:53:05 -0500 Subject: [PATCH] ah began removing mobile middlescroll fixed prompt not showing when crash the engine was selected in the debug menu removed resolution scaling for android players --- source/ClientPrefs.hx | 2 ++ source/PlayState.hx | 7 +------ source/Prompt.hx | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/ClientPrefs.hx b/source/ClientPrefs.hx index 24d00803e47..f024bc4f0b7 100644 --- a/source/ClientPrefs.hx +++ b/source/ClientPrefs.hx @@ -461,6 +461,7 @@ class ClientPrefs { //default settings if it can't find a save file containing y } if (FlxG.save.data.resolution != null) { resolution = FlxG.save.data.resolution; + #if desktop var resolutionValue = cast(ClientPrefs.resolution, String); if (resolutionValue != null) { @@ -478,6 +479,7 @@ class ClientPrefs { //default settings if it can't find a save file containing y } } } + #end } if(FlxG.save.data.pbRControls != null) { pbRControls = FlxG.save.data.pbRControls; diff --git a/source/PlayState.hx b/source/PlayState.hx index 2f746030330..d183b4df228 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -4520,8 +4520,7 @@ class PlayState extends MusicBeatState if (player < 1) { if(!ClientPrefs.opponentStrums) targetAlpha = 0; - else if(ClientPrefs.middleScroll || ClientPrefs.mobileMidScroll) targetAlpha = ClientPrefs.oppNoteAlpha; - if (ClientPrefs.mobileMidScroll) opponentStrums.members[i].x == FlxG.width - 2; //make it so that you're unable to see the opponent's strums if you have mobile styled middlescroll on + else if(ClientPrefs.middleScroll) targetAlpha = ClientPrefs.oppNoteAlpha; } var babyArrow:StrumNote = new StrumNote(ClientPrefs.middleScroll || ClientPrefs.mobileMidScroll ? STRUM_X_MIDDLESCROLL : STRUM_X, strumLine.y, i, player); @@ -4552,10 +4551,6 @@ class PlayState extends MusicBeatState babyArrow.x += FlxG.width / 2 + 25; } } - if(ClientPrefs.mobileMidScroll) - { - babyArrow.x += FlxG.width / 2; - } if (!opponentChart || opponentChart && ClientPrefs.mobileMidScroll || opponentChart && ClientPrefs.mobileMidScroll || !opponentChart && ClientPrefs.mobileMidScroll) opponentStrums.add(babyArrow); else if (ClientPrefs.mobileMidScroll) insert(members.indexOf(playerStrums), babyArrow); else playerStrums.add(babyArrow); diff --git a/source/Prompt.hx b/source/Prompt.hx index b60cc945fef..01e5222e470 100644 --- a/source/Prompt.hx +++ b/source/Prompt.hx @@ -50,6 +50,7 @@ class Prompt extends MusicBeatSubstate override public function create():Void { + cameras = [FlxG.cameras.list[FlxG.cameras.list.length-1]]; super.create(); if (goAnyway){