Skip to content

Commit

Permalink
Fix hotbar stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
UnknownX7 committed Jun 30, 2024
1 parent d770d70 commit 81189d1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ActionStackManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static Bool OnUseAction(ActionManager* actionManager, uint actionType, ui
if (ReAction.Config.EnableInstantGroundTarget && !succeeded && queuedGroundTargetObjectID == 0)
SetInstantGroundTarget(actionType, useType);

return ret.Value;
return ret!.Value;
}
catch (Exception e)
{
Expand Down
2 changes: 1 addition & 1 deletion Game.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static bool IsActionOutOfRange(uint actionID, GameObject* o) => DalamudAp
public static void SetHotbarSlot(int hotbar, int slot, byte type, uint id)
{
if (hotbar is < 0 or > 17 || (hotbar < 10 ? slot is < 0 or > 11 : slot is < 0 or > 15)) return;
Framework.Instance()->GetUIModule()->GetRaptureHotbarModule()->SetAndSaveSlot((uint)hotbar, (uint)slot, (RaptureHotbarModule.HotbarSlotType)type, id);
Framework.Instance()->GetUIModule()->GetRaptureHotbarModule()->SetAndSaveSlot((uint)hotbar, (uint)slot, (RaptureHotbarModule.HotbarSlotType)type, id, false, false);
}

public delegate Bool UseActionDelegate(ActionManager* actionManager, uint actionType, uint actionID, ulong targetObjectID, uint param, uint useType, int pvp, bool* isGroundTarget);
Expand Down
2 changes: 1 addition & 1 deletion PluginUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ private static void DrawOtherSettings()
{
HeaderTextAction = () => ImGuiEx.SetItemTooltip(
"This will allow you to place various things on the hotbar that you can't normally." +
"\nIf you don't know what this can be used for, don't touch it. Whatever you place on it MUST BE MOVED OR ELSE IT WILL NOT SAVE." +
"\nIf you don't know what this can be used for, don't touch it." +
"\nSome examples of things you can do:" +
"\n\tPlace a certain action on the hotbar to be used with one of the \"Sundering\" features. The IDs are in each setting's tooltip." +
"\n\tPlace a certain doze and sit emote on the hotbar (Emote, 88 and 95)." +
Expand Down

0 comments on commit 81189d1

Please sign in to comment.