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

Merge branch 'master' into RetainerNotify

Browse source
This commit is contained in:
meli 2019-11-21 23:18:18 -08:00
commit 3d07a3800a
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Dalamud/Game/Internal/Gui/IconReplacer.cs
View file

@ -85,7 +85,15 @@ namespace Dalamud.Game.Internal.Gui {
if (this.VanillaIDs.Contains(actionID)) return this.iconHook.Original(self, actionID); if (this.VanillaIDs.Contains(actionID)) return this.iconHook.Original(self, actionID);
if (!this.CustomIDs.Contains(actionID)) return actionID; if (!this.CustomIDs.Contains(actionID)) return actionID;
if (this.activeBuffArray == IntPtr.Zero) {
try {
this.activeBuffArray = FindBuffAddress();
}
catch(Exception e) { //Before you're loaded in
this.activeBuffArray = IntPtr.Zero;
return this.iconHook.Original(self, actionID);
}
}
// Don't clutter the spaghetti any worse than it already is. // Don't clutter the spaghetti any worse than it already is.
var lastMove = Marshal.ReadInt32(this.lastComboMove); var lastMove = Marshal.ReadInt32(this.lastComboMove);
var comboTime = Marshal.ReadInt32(this.comboTimer); var comboTime = Marshal.ReadInt32(this.comboTimer);
@ -826,11 +834,10 @@ namespace Dalamud.Game.Internal.Gui {
return this.iconHook.Original(self, actionID); return this.iconHook.Original(self, actionID);
} }
private bool SearchBuffArray(short needle) {/* private bool SearchBuffArray(short needle) {
for (int i = 0; i < 60; i++) { for (int i = 0; i < 60; i++) {
if (Marshal.ReadInt16(activeBuffArray + 4 * i) == needle) return true; if (Marshal.ReadInt16(activeBuffArray + 4 * i) == needle) return true;
} }
*/
return false; return false;
} }