Skip to content
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

Jump to bottom

Update DIK Codes include path #1090

Merged
merged 4 commits into from
Mar 7, 2019
Merged

Update DIK Codes include path #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f503fa2
Update DIK Codes define path
jonpas Mar 4, 2019
91583fb
Update fnc_add.sqf
jonpas Mar 4, 2019
a7863c2
Update script_component.hpp
jonpas Mar 4, 2019
f42a83c
Update fnc_addKeybind.sqf
jonpas Mar 4, 2019
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
2 changes: 1 addition & 1 deletion addons/events/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#define GETOBJ(obj) (if (obj isEqualType grpNull) then {leader obj} else {obj})

#include "\a3\editor_f\Data\Scripts\dikCodes.h"
#include "\a3\ui_f\hpp\defineDIKCodes.inc"

// key handler system
#define MOUSE_OFFSET 0xF0
Expand Down
4 changes: 2 additions & 2 deletions addons/keybinding/fnc_addKeybind.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Description:
a function with that keybind being pressed.

This file should be included for readable DIK codes:
#include "\a3\editor_f\Data\Scripts\dikCodes.h"
#include "\a3\ui_f\hpp\defineDIKCodes.inc"

Additional DIK codes usable with this function:
0xF0: Left mouse button
Expand Down Expand Up @@ -40,7 +40,7 @@ Returns:
Examples:
(begin example)
// Register a simple keypress to an action
#include "\a3\editor_f\Data\Scripts\dikCodes.h"
#include "\a3\ui_f\hpp\defineDIKCodes.inc"

["MyMod", "MyKey", ["My Pretty Key Name", "My Pretty Tool Tip"], {
_this call mymod_fnc_keyDown
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/fnc_add.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
TRACE_1("",_this);

// _this = ["player", [DIK_LSHIFT], -3, ["mission\weapon_menuDef.sqf", ["main"]]]
// Note: calling script may require this file for dik codes: #include "\a3\editor_f\Data\Scripts\dikCodes.h"
// Note: calling script may require this file for dik codes: #include "\a3\ui_f\hpp\defineDIKCodes.inc"

private _msg = "FLEXIMENU: Unknown Error in fnc_add.sqf"; //Initialize
private _key = [];
Expand Down