ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 12:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

chore: clean up file-scoped namespace fallout

Browse source
This commit is contained in:
goat 2022-10-29 15:54:24 +02:00
parent b4a89020e0
commit 09c4828a9e
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Data/DataManager.cs
View file

@ -66,7 +66,7 @@ public sealed class DataManager : IDisposable, IServiceType
LoadMultithreaded = true, LoadMultithreaded = true,
CacheFileResources = true, CacheFileResources = true,
#if DEBUG #if DEBUG
PanicOnSheetChecksumMismatch = true, PanicOnSheetChecksumMismatch = true,
#else #else
PanicOnSheetChecksumMismatch = false, PanicOnSheetChecksumMismatch = false,
#endif #endif

6
Dalamud/EntryPoint.cs
View file

@ -84,9 +84,9 @@ public sealed class EntryPoint
internal static void InitLogging(string baseDirectory, bool logConsole, bool logSynchronously) internal static void InitLogging(string baseDirectory, bool logConsole, bool logSynchronously)
{ {
#if DEBUG #if DEBUG
var logPath = Path.Combine(baseDirectory, "dalamud.log"); var logPath = Path.Combine(baseDirectory, "dalamud.log");
var oldPath = Path.Combine(baseDirectory, "dalamud.old.log"); var oldPath = Path.Combine(baseDirectory, "dalamud.old.log");
var oldPathOld = Path.Combine(baseDirectory, "dalamud.log.old"); var oldPathOld = Path.Combine(baseDirectory, "dalamud.log.old");
#else #else
var logPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.log"); var logPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.log");
var oldPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.old.log"); var oldPath = Path.Combine(baseDirectory, "..", "..", "..", "dalamud.old.log");

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

@ -63,7 +63,7 @@ internal class DalamudInterface : IDisposable, IServiceType
private readonly TextureWrap tsmLogoTexture; private readonly TextureWrap tsmLogoTexture;
#if DEBUG #if DEBUG
private bool isImGuiDrawDevMenu = true; private bool isImGuiDrawDevMenu = true;
#else #else
private bool isImGuiDrawDevMenu = false; private bool isImGuiDrawDevMenu = false;
#endif #endif

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

@ -985,7 +985,7 @@ internal class InterfaceManager : IDisposable, IServiceType
private IntPtr ResizeBuffersDetour(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags) private IntPtr ResizeBuffersDetour(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags)
{ {
#if DEBUG #if DEBUG
Log.Verbose($"Calling resizebuffers swap@{swapChain.ToInt64():X}{bufferCount} {width} {height} {newFormat} {swapChainFlags}"); Log.Verbose($"Calling resizebuffers swap@{swapChain.ToInt64():X}{bufferCount} {width} {height} {newFormat} {swapChainFlags}");
#endif #endif
this.ResizeBuffers?.InvokeSafely(); this.ResizeBuffers?.InvokeSafely();

10
Dalamud/Interface/Internal/Windows/DataWindow.cs
View file

@ -759,7 +759,7 @@ internal class DataWindow : Window
var condition = Service<Condition>.Get(); var condition = Service<Condition>.Get();
#if DEBUG #if DEBUG
ImGui.Text($"ptr: 0x{condition.Address.ToInt64():X}"); ImGui.Text($"ptr: 0x{condition.Address.ToInt64():X}");
#endif #endif
ImGui.Text("Current Conditions:"); ImGui.Text("Current Conditions:");
@ -1310,11 +1310,11 @@ internal class DataWindow : Window
ImGui.Text($"GamepadInput 0x{gamepadState.GamepadInputAddress.ToInt64():X}"); ImGui.Text($"GamepadInput 0x{gamepadState.GamepadInputAddress.ToInt64():X}");
#if DEBUG #if DEBUG
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGui.SetMouseCursor(ImGuiMouseCursor.Hand); ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
if (ImGui.IsItemClicked()) if (ImGui.IsItemClicked())
ImGui.SetClipboardText($"0x{gamepadState.GamepadInputAddress.ToInt64():X}"); ImGui.SetClipboardText($"0x{gamepadState.GamepadInputAddress.ToInt64():X}");
#endif #endif
DrawHelper( DrawHelper(

8
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -2656,16 +2656,16 @@ internal class PluginInstallerWindow : Window, IDisposable
{ {
Log.Error(ex, "Plugin installer threw an error"); Log.Error(ex, "Plugin installer threw an error");
#if DEBUG #if DEBUG
if (!string.IsNullOrEmpty(ex.Message)) if (!string.IsNullOrEmpty(ex.Message))
errorModalMessage += $"\n\n{ex.Message}"; errorModalMessage += $"\n\n{ex.Message}";
#endif #endif
} }
else else
{ {
Log.Error(ex, "Plugin installer threw an unexpected error"); Log.Error(ex, "Plugin installer threw an unexpected error");
#if DEBUG #if DEBUG
if (!string.IsNullOrEmpty(ex.Message)) if (!string.IsNullOrEmpty(ex.Message))
errorModalMessage += $"\n\n{ex.Message}"; errorModalMessage += $"\n\n{ex.Message}";
#endif #endif
} }
} }

2
Dalamud/Interface/UiBuilder.cs
View file

@ -197,7 +197,7 @@ public sealed class UiBuilder : IDisposable
/// Gets or sets a value indicating whether statistics about UI draw time should be collected. /// Gets or sets a value indicating whether statistics about UI draw time should be collected.
/// </summary> /// </summary>
#if DEBUG #if DEBUG
internal static bool DoStats { get; set; } = true; internal static bool DoStats { get; set; } = true;
#else #else
internal static bool DoStats { get; set; } = false; internal static bool DoStats { get; set; } = false;
#endif #endif