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

merge part 2

Browse source
This commit is contained in:
goat 2020-06-05 14:36:51 +02:00
parent eb66ce881c
commit 2f180d7c7d
1 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dalamud/Dalamud.cs
View file

@ -151,8 +151,6 @@ namespace Dalamud {
IsReady = true; IsReady = true;
}); });
this.conditionDebugWindow = new ConditionDebugWindow( this );
} }
public void Start() { public void Start() {
@ -218,7 +216,6 @@ namespace Dalamud {
private DalamudCreditsWindow creditsWindow; private DalamudCreditsWindow creditsWindow;
private DalamudSettingsWindow settingsWindow; private DalamudSettingsWindow settingsWindow;
private PluginInstallerWindow pluginWindow; private PluginInstallerWindow pluginWindow;
private ConditionDebugWindow conditionDebugWindow;
private DalamudPluginStatWindow pluginStatWindow; private DalamudPluginStatWindow pluginStatWindow;
private void BuildDalamudUi() private void BuildDalamudUi()
@ -279,16 +276,6 @@ namespace Dalamud {
ImGui.EndMenu(); ImGui.EndMenu();
} }
if( ImGui.BeginMenu( "Game" ) )
{
if( ImGui.MenuItem( "Condition Debug" ) )
{
this.conditionDebugWindow.Enabled = !this.conditionDebugWindow.Enabled;
}
ImGui.EndMenu();
}
if (ImGui.BeginMenu("Plugins")) if (ImGui.BeginMenu("Plugins"))
{ {
if (ImGui.MenuItem("Open Plugin installer")) if (ImGui.MenuItem("Open Plugin installer"))
@ -400,11 +387,6 @@ namespace Dalamud {
if (this.isImguiDrawDemoWindow) if (this.isImguiDrawDemoWindow)
ImGui.ShowDemoWindow(); ImGui.ShowDemoWindow();
if( this.conditionDebugWindow.Enabled )
{
this.conditionDebugWindow.Draw();
}
if (this.isImguiDrawPluginStatWindow) { if (this.isImguiDrawPluginStatWindow) {
this.isImguiDrawPluginStatWindow = this.pluginStatWindow != null && this.pluginStatWindow.Draw(); this.isImguiDrawPluginStatWindow = this.pluginStatWindow != null && this.pluginStatWindow.Draw();
if (!this.isImguiDrawPluginStatWindow) { if (!this.isImguiDrawPluginStatWindow) {