Skip to content

Read flags arg in IsControlPressed #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
korri123 merged 1 commit into from
Sep 1, 2026
Merged

Read flags arg in IsControlPressed #276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions nvse/nvse/Commands_Input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,14 +439,15 @@ bool Cmd_IsControlPressed_Eval(COMMAND_ARGS_EVAL)
*result = 0;

UInt32 ctrl = (UInt32)arg1;
UInt32 flags = (UInt32)arg2;
UInt32 keycode = GetControl(ctrl, OSInputGlobals::kControlType_Keyboard);

if(keycode != 0xFF && DIHookControl::GetSingleton().IsKeyPressed(keycode))
if(keycode != 0xFF && DIHookControl::GetSingleton().IsKeyPressed(keycode, flags))
*result = 1;
else
{
keycode = GetControl(ctrl, OSInputGlobals::kControlType_Mouse);
if(keycode != 0xFF && DIHookControl::GetSingleton().IsKeyPressed(keycode))
if(keycode != 0xFF && DIHookControl::GetSingleton().IsKeyPressed(keycode, flags))
*result = 1;
}

Expand All @@ -456,10 +457,10 @@ bool Cmd_IsControlPressed_Eval(COMMAND_ARGS_EVAL)
bool Cmd_IsControlPressed_Execute(COMMAND_ARGS)
{
*result = 0;
UInt32 ctrl, flags = 1;
UInt32 ctrl, flags = 0;

if (ExtractArgs(EXTRACT_ARGS, &ctrl, &flags))
return Cmd_IsControlPressed_Eval(thisObj, (void*)ctrl, 0, result);
return Cmd_IsControlPressed_Eval(thisObj, (void*)ctrl, (void*)flags, result);

return true;
}
Expand Down
Loading