Skip to content

Commit

Permalink
Merge pull request #512 from FFXIV-CombatReborn/mergeWIP
Browse files Browse the repository at this point in the history
rollback multi monitor change
  • Loading branch information
CarnifexOptimus authored Dec 22, 2024
2 parents d2f10d1 + 2bb1fb5 commit 5308922
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion BossMod/BossModule/BossModuleHintsWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public override void PreOpenCheck()
Flags |= ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoInputs;
if (_mgr.Config.HintsInSeparateWindowTransparent)
Flags |= ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoBackground;
// ForceMainWindow = _mgr.Config.HintsInSeparateWindowTransparent; // NoBackground flag without ForceMainWindow works incorrectly for whatever reason
ForceMainWindow = _mgr.Config.HintsInSeparateWindowTransparent; // NoBackground flag without ForceMainWindow works incorrectly for whatever reason
}

public override void Draw()
Expand Down
2 changes: 1 addition & 1 deletion BossMod/BossModule/BossModuleMainWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public override void PreOpenCheck()
Flags |= ImGuiWindowFlags.NoDecoration | ImGuiWindowFlags.NoBackground;
if (_mgr.Config.Lock)
Flags |= ImGuiWindowFlags.NoMove | ImGuiWindowFlags.NoInputs;
// ForceMainWindow = _mgr.Config.TrishaMode; // NoBackground flag without ForceMainWindow works incorrectly for whatever reason
ForceMainWindow = _mgr.Config.TrishaMode; // NoBackground flag without ForceMainWindow works incorrectly for whatever reason

if (_mgr.Config.ShowWorldArrows && _mgr.ActiveModule != null && _mgr.WorldState.Party[PartyState.PlayerSlot] is var pc && pc != null)
DrawMovementHints(_mgr.ActiveModule.CalculateMovementHintsForRaidMember(PartyState.PlayerSlot, pc), pc.PosRot.Y);
Expand Down
2 changes: 1 addition & 1 deletion BossMod/Modules/Stormblood/DeepDungeon/DD30Hiruko.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public DD30HirukoStates(BossModule module) : base(module)
}
}

[ModuleInfo(BossModuleInfo.Maturity.WIP, Contributors = "Malediktus, LegendofIceman", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 542, NameID = 7482)]
[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "Malediktus, LegendofIceman", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 542, NameID = 7482)]
public class DD30Hiruko(WorldState ws, Actor primary) : BossModule(ws, primary, arena.Center, arena)
{
private static readonly ArenaBoundsComplex arena = new([new Polygon(new(-300, -300), 24.5f * CosPI.Pi48th, 48, 3.75f.Degrees())], [new Rectangle(new(-300, -325), 20, 1.25f)]);
Expand Down

0 comments on commit 5308922

Please sign in to comment.