Skip to content

Commit 176e2eb

Browse files
poco0317poco0317
committed
for most cases dont depend on dlman for playeroptions thing
its ridiculous to include dlman here anyways
1 parent acb3da8 commit 176e2eb

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎src/Etterna/Models/Misc/PlayerOptions.cpp

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ PlayerOptions::FromOneModString(const std::string& sOneMod,
523523
m_fTimeSpacing = 0;
524524
}
525525

526-
else if (sBit == "clearall" && (!DLMAN->gameplay || forReplay)) {
526+
else if (sBit == "clearall" && (forReplay || !DLMAN->gameplay)) {
527527
Init();
528528
m_sNoteSkin = NOTESKIN->GetDefaultNoteSkinName();
529529
} else if (sBit == "resetspeed") {
@@ -537,22 +537,22 @@ PlayerOptions::FromOneModString(const std::string& sOneMod,
537537
SET_FLOAT(fScrollSpeed);
538538
level = CMOD_DEFAULT;
539539
SET_FLOAT(fScrollBPM)
540-
} else if (sBit == "life" || sBit == "lives" && (!DLMAN->gameplay || forReplay)) {
540+
} else if (sBit == "life" || sBit == "lives" && (forReplay || !DLMAN->gameplay)) {
541541
// level is a percentage for every other option, so multiply by 100.
542542
// -Kyz
543543
m_BatteryLives = static_cast<int>(level * 100.0f);
544-
} else if (sBit == "bar" && (!DLMAN->gameplay || forReplay)) {
544+
} else if (sBit == "bar" && (forReplay || !DLMAN->gameplay)) {
545545
m_LifeType = LifeType_Bar;
546-
} else if (sBit == "battery" && (!DLMAN->gameplay || forReplay)) {
546+
} else if (sBit == "battery" && (forReplay || !DLMAN->gameplay)) {
547547
m_LifeType = LifeType_Battery;
548-
} else if (sBit == "lifetime" && (!DLMAN->gameplay || forReplay)) {
548+
} else if (sBit == "lifetime" && (forReplay || !DLMAN->gameplay)) {
549549
m_LifeType = LifeType_Time;
550550
} else if (sBit == "norecover" ||
551-
sBit == "power-drop" && (!DLMAN->gameplay || forReplay)) {
551+
sBit == "power-drop" && (forReplay || !DLMAN->gameplay)) {
552552
m_DrainType = DrainType_NoRecover;
553-
} else if (sBit == "suddendeath" || sBit == "death" && (!DLMAN->gameplay || forReplay)) {
553+
} else if (sBit == "suddendeath" || sBit == "death" && (forReplay || !DLMAN->gameplay)) {
554554
m_DrainType = DrainType_SuddenDeath;
555-
} else if (sBit == "normal-drain" && (!DLMAN->gameplay || forReplay)) {
555+
} else if (sBit == "normal-drain" && (forReplay || !DLMAN->gameplay)) {
556556
m_DrainType = DrainType_Normal;
557557
} else if (sBit == "boost")
558558
SET_FLOAT(fAccels[ACCEL_BOOST])
@@ -608,61 +608,61 @@ PlayerOptions::FromOneModString(const std::string& sOneMod,
608608
SET_FLOAT(fAppearances[APPEARANCE_RANDOMVANISH])
609609
else if (sBit == "turn" && !on)
610610
ZERO(m_bTurns); /* "no turn" */
611-
else if (sBit == "mirror" && (!DLMAN->gameplay || forReplay))
611+
else if (sBit == "mirror" && (forReplay || !DLMAN->gameplay))
612612
m_bTurns[TURN_MIRROR] = on;
613-
else if (sBit == "backwards" && (!DLMAN->gameplay || forReplay))
613+
else if (sBit == "backwards" && (forReplay || !DLMAN->gameplay))
614614
m_bTurns[TURN_BACKWARDS] = on;
615-
else if (sBit == "left" && (!DLMAN->gameplay || forReplay))
615+
else if (sBit == "left" && (forReplay || !DLMAN->gameplay))
616616
m_bTurns[TURN_LEFT] = on;
617-
else if (sBit == "right" && (!DLMAN->gameplay || forReplay))
617+
else if (sBit == "right" && (forReplay || !DLMAN->gameplay))
618618
m_bTurns[TURN_RIGHT] = on;
619-
else if (sBit == "shuffle" && (!DLMAN->gameplay || forReplay))
619+
else if (sBit == "shuffle" && (forReplay || !DLMAN->gameplay))
620620
m_bTurns[TURN_SHUFFLE] = on;
621-
else if (sBit == "softshuffle" && (!DLMAN->gameplay || forReplay))
621+
else if (sBit == "softshuffle" && (forReplay || !DLMAN->gameplay))
622622
m_bTurns[TURN_SOFT_SHUFFLE] = on;
623-
else if (sBit == "supershuffle" && (!DLMAN->gameplay || forReplay))
623+
else if (sBit == "supershuffle" && (forReplay || !DLMAN->gameplay))
624624
m_bTurns[TURN_SUPER_SHUFFLE] = on;
625-
else if (sBit == "hranshuffle" && (!DLMAN->gameplay || forReplay))
625+
else if (sBit == "hranshuffle" && (forReplay || !DLMAN->gameplay))
626626
m_bTurns[TURN_HRAN_SHUFFLE] = on;
627-
else if (sBit == "little" && (!DLMAN->gameplay || forReplay))
627+
else if (sBit == "little" && (forReplay || !DLMAN->gameplay))
628628
m_bTransforms[TRANSFORM_LITTLE] = on;
629-
else if (sBit == "wide" && (!DLMAN->gameplay || forReplay))
629+
else if (sBit == "wide" && (forReplay || !DLMAN->gameplay))
630630
m_bTransforms[TRANSFORM_WIDE] = on;
631-
else if (sBit == "big" && (!DLMAN->gameplay || forReplay))
631+
else if (sBit == "big" && (forReplay || !DLMAN->gameplay))
632632
m_bTransforms[TRANSFORM_BIG] = on;
633-
else if (sBit == "quick" && (!DLMAN->gameplay || forReplay))
633+
else if (sBit == "quick" && (forReplay || !DLMAN->gameplay))
634634
m_bTransforms[TRANSFORM_QUICK] = on;
635-
else if (sBit == "bmrize" && (!DLMAN->gameplay || forReplay))
635+
else if (sBit == "bmrize" && (forReplay || !DLMAN->gameplay))
636636
m_bTransforms[TRANSFORM_BMRIZE] = on;
637-
else if (sBit == "skippy" && (!DLMAN->gameplay || forReplay))
637+
else if (sBit == "skippy" && (forReplay || !DLMAN->gameplay))
638638
m_bTransforms[TRANSFORM_SKIPPY] = on;
639-
else if (sBit == "mines" && (!DLMAN->gameplay || forReplay))
639+
else if (sBit == "mines" && (forReplay || !DLMAN->gameplay))
640640
m_bTransforms[TRANSFORM_MINES] = on;
641-
else if (sBit == "attackmines" && (!DLMAN->gameplay || forReplay))
641+
else if (sBit == "attackmines" && (forReplay || !DLMAN->gameplay))
642642
m_bTransforms[TRANSFORM_ATTACKMINES] = on;
643-
else if (sBit == "echo" && (!DLMAN->gameplay || forReplay))
643+
else if (sBit == "echo" && (forReplay || !DLMAN->gameplay))
644644
m_bTransforms[TRANSFORM_ECHO] = on;
645-
else if (sBit == "stomp" && (!DLMAN->gameplay || forReplay))
645+
else if (sBit == "stomp" && (forReplay || !DLMAN->gameplay))
646646
m_bTransforms[TRANSFORM_STOMP] = on;
647-
else if (sBit == "jackjs" && (!DLMAN->gameplay || forReplay))
647+
else if (sBit == "jackjs" && (forReplay || !DLMAN->gameplay))
648648
m_bTransforms[TRANSFORM_JACKJS] = on;
649-
else if (sBit == "anchorjs" && (!DLMAN->gameplay || forReplay))
649+
else if (sBit == "anchorjs" && (forReplay || !DLMAN->gameplay))
650650
m_bTransforms[TRANSFORM_ANCHORJS] = on;
651-
else if (sBit == "icyworld" && (!DLMAN->gameplay || forReplay))
651+
else if (sBit == "icyworld" && (forReplay || !DLMAN->gameplay))
652652
m_bTransforms[TRANSFORM_ICYWORLD] = on;
653-
else if (sBit == "planted" && (!DLMAN->gameplay || forReplay))
653+
else if (sBit == "planted" && (forReplay || !DLMAN->gameplay))
654654
m_bTransforms[TRANSFORM_PLANTED] = on;
655-
else if (sBit == "floored" && (!DLMAN->gameplay || forReplay))
655+
else if (sBit == "floored" && (forReplay || !DLMAN->gameplay))
656656
m_bTransforms[TRANSFORM_FLOORED] = on;
657-
else if (sBit == "twister" && (!DLMAN->gameplay || forReplay))
657+
else if (sBit == "twister" && (forReplay || !DLMAN->gameplay))
658658
m_bTransforms[TRANSFORM_TWISTER] = on;
659-
else if (sBit == "holdrolls" && (!DLMAN->gameplay || forReplay))
659+
else if (sBit == "holdrolls" && (forReplay || !DLMAN->gameplay))
660660
m_bTransforms[TRANSFORM_HOLDROLLS] = on;
661-
else if (sBit == "nojumps" && (!DLMAN->gameplay || forReplay))
661+
else if (sBit == "nojumps" && (forReplay || !DLMAN->gameplay))
662662
m_bTransforms[TRANSFORM_NOJUMPS] = on;
663-
else if (sBit == "nohands" && (!DLMAN->gameplay || forReplay))
663+
else if (sBit == "nohands" && (forReplay || !DLMAN->gameplay))
664664
m_bTransforms[TRANSFORM_NOHANDS] = on;
665-
else if (sBit == "noquads" && (!DLMAN->gameplay || forReplay))
665+
else if (sBit == "noquads" && (forReplay || !DLMAN->gameplay))
666666
m_bTransforms[TRANSFORM_NOQUADS] = on;
667667
else if (sBit == "reverse")
668668
SET_FLOAT(fScrolls[SCROLL_REVERSE])
@@ -674,17 +674,17 @@ PlayerOptions::FromOneModString(const std::string& sOneMod,
674674
SET_FLOAT(fScrolls[SCROLL_CROSS])
675675
else if (sBit == "centered")
676676
SET_FLOAT(fScrolls[SCROLL_CENTERED])
677-
else if (sBit == "noholds" && (!DLMAN->gameplay || forReplay))
677+
else if (sBit == "noholds" && (forReplay || !DLMAN->gameplay))
678678
m_bTransforms[TRANSFORM_NOHOLDS] = on;
679-
else if (sBit == "norolls" && (!DLMAN->gameplay || forReplay))
679+
else if (sBit == "norolls" && (forReplay || !DLMAN->gameplay))
680680
m_bTransforms[TRANSFORM_NOROLLS] = on;
681-
else if (sBit == "nomines" && (!DLMAN->gameplay || forReplay))
681+
else if (sBit == "nomines" && (forReplay || !DLMAN->gameplay))
682682
m_bTransforms[TRANSFORM_NOMINES] = on;
683-
else if (sBit == "nostretch" && (!DLMAN->gameplay || forReplay))
683+
else if (sBit == "nostretch" && (forReplay || !DLMAN->gameplay))
684684
m_bTransforms[TRANSFORM_NOSTRETCH] = on;
685-
else if (sBit == "nolifts" && (!DLMAN->gameplay || forReplay))
685+
else if (sBit == "nolifts" && (forReplay || !DLMAN->gameplay))
686686
m_bTransforms[TRANSFORM_NOLIFTS] = on;
687-
else if (sBit == "nofakes" && (!DLMAN->gameplay || forReplay))
687+
else if (sBit == "nofakes" && (forReplay || !DLMAN->gameplay))
688688
m_bTransforms[TRANSFORM_NOFAKES] = on;
689689
else if (sBit == "dark")
690690
SET_FLOAT(fDark)
@@ -698,7 +698,7 @@ PlayerOptions::FromOneModString(const std::string& sOneMod,
698698
SET_FLOAT(fNoAttack)
699699
else if (sBit == "playerautoplay")
700700
SET_FLOAT(fPlayerAutoPlay)
701-
else if (sBit == "passmark" && (!DLMAN->gameplay || forReplay))
701+
else if (sBit == "passmark" && (forReplay || !DLMAN->gameplay))
702702
SET_FLOAT(fPassmark)
703703
else if (sBit == "overhead") {
704704
m_fSkew = 0;
@@ -734,9 +734,9 @@ PlayerOptions::FromOneModString(const std::string& sOneMod,
734734
else if (sBit == "failarcade" || sBit == "failimmediate")
735735
m_FailType = FailType_Immediate;
736736
else if ((sBit == "failendofsong" || sBit == "failimmediatecontinue" ||
737-
sBit == "failatend") && (!DLMAN->gameplay || forReplay))
737+
sBit == "failatend") && (forReplay || !DLMAN->gameplay))
738738
m_FailType = FailType_ImmediateContinue;
739-
else if (sBit == "failoff" && (!DLMAN->gameplay || forReplay))
739+
else if (sBit == "failoff" && (forReplay || !DLMAN->gameplay))
740740
m_FailType = FailType_Off;
741741
else if (sBit == "faildefault") {
742742
PlayerOptions po;
@@ -746,7 +746,7 @@ PlayerOptions::FromOneModString(const std::string& sOneMod,
746746
m_bMuteOnError = on;
747747
else if (sBit == "random")
748748
ChooseRandomModifiers();
749-
else if (sBit == "practicemode" && (!DLMAN->gameplay || forReplay))
749+
else if (sBit == "practicemode" && (forReplay || !DLMAN->gameplay))
750750
m_bPractice = on;
751751
// deprecated mods/left in for compatibility
752752
else if (sBit == "converge")

‎src/Etterna/Models/Misc/PlayerOptions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ class PlayerOptions
273273
*
274274
* If an empty string, it means to not change from the default. */
275275
std::string m_sNoteSkin;
276-
bool forReplay = false;
276+
bool forReplay{ false };
277277

278278
void NextAccel();
279279
void NextEffect();

0 commit comments

Comments
 (0)