diff --git a/Dalamud/Interface/Scratchpad/ScratchMacroProcessor.cs b/Dalamud/Interface/Scratchpad/ScratchMacroProcessor.cs index ad29affae..68d5dab80 100644 --- a/Dalamud/Interface/Scratchpad/ScratchMacroProcessor.cs +++ b/Dalamud/Interface/Scratchpad/ScratchMacroProcessor.cs @@ -190,12 +190,18 @@ public class ScratchPlugin : IDalamudPlugin { if (hook.RetType != "void") originalCall = "return " + originalCall; - if (hook.Body.Contains("hook{i}Inst.Original")) + if (hook.Body.Contains($"hook{i}Inst.Original(") || hook.Body.Contains("ORIG(")) { PluginLog.Warning($"Attention! A manual call to Original() in Hook #{i} was detected. Original calls will not be managed for you."); originalCall = string.Empty; } + if (hook.Body.Contains("ORIG(")) + { + PluginLog.Warning($"Normalizing Original() call in Hook #{i}."); + hook.Body = hook.Body.Replace("ORIG(", $"this.hook{i}Inst.Original("); + } + hookDetour += $"private {hook.RetType} Hook{i}Detour({hook.Arguments}) {{\n" + $"try {{\n" +