ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-01 05:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use MiniGame BGM scene for About tab

Browse source
This commit is contained in:
Haselnussbomber 2024-11-30 19:59:42 +01:00
parent 1830af59fd
commit da718b64c1
No known key found for this signature in database
GPG key ID: BB905BB49E7295D1
4 changed files with 34 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Interface/Internal/DalamudCommands.cs
View file

@ -266,7 +266,7 @@ internal class DalamudCommands : IServiceType
else
{
// Revert to the original BGM by specifying an invalid one
gameGui.SetBgm(9999);
gameGui.ResetBgm();
}
}

24
Dalamud/Interface/Internal/Windows/Settings/Tabs/SettingsTabAbout.cs
View file

@ -1,4 +1,4 @@
using System.Diagnostics;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Numerics;
@ -194,6 +194,7 @@ Contribute at: https://github.com/goatcorp/Dalamud
private readonly IFontAtlas privateAtlas;
private string creditsText;
private bool isBgmSet;
private bool resetNow = false;
private IDalamudTextureWrap? logoTexture;
@ -222,10 +223,13 @@ Contribute at: https://github.com/goatcorp/Dalamud
this.creditsText = string.Format(CreditsTextTempl, typeof(Dalamud).Assembly.GetName().Version, pluginCredits, Util.GetGitHashClientStructs());
var gg = Service<GameGui>.Get();
if (!gg.IsOnTitleScreen() && UIState.Instance() != null)
var gameGui = Service<GameGui>.Get();
var playerState = PlayerState.Instance();
if (!gameGui.IsInLobby() && playerState != null)
{
gg.SetBgm((ushort)(UIState.Instance()->PlayerState.MaxExpansion > 3 ? 833 : 132));
gameGui.SetBgm((ushort)(playerState->MaxExpansion > 3 ? 833 : 132));
this.isBgmSet = true;
}
this.creditsThrottler.Restart();
@ -242,9 +246,15 @@ Contribute at: https://github.com/goatcorp/Dalamud
{
this.creditsThrottler.Reset();
var gg = Service<GameGui>.Get();
if (!gg.IsOnTitleScreen())
gg.SetBgm(9999);
if (this.isBgmSet)
{
var gameGui = Service<GameGui>.Get();
if (!gameGui.IsInLobby())
gameGui.ResetBgm();
this.isBgmSet = false;
}
Service<DalamudInterface>.Get().SetCreditsDarkeningAnimation(false);
}