key macros, sort prep, space headers

PabstMirror · johnb432 · web-flow · commit dd5e745736cf · 2025-06-16T10:29:59.000-05:00
Co-authored-by: johnb432 &lt;58661205+johnb432@users.noreply.github.com&gt;
diff --git a/addons/spike/ACE_GuidanceConfig.hpp b/addons/spike/ACE_GuidanceConfig.hpp
@@ -1,9 +1,9 @@
-class ace_missileguidance_SeekerTypes {
+class EGVAR(missileguidance,SeekerTypes) {
     class SPIKE {
         functionName = QFUNC(seeker);
     };
 };
-class ace_missileguidance_NavigationTypes {
+class EGVAR(missileguidance,NavigationTypes) {
     class SPIKE {
         functionName = QFUNC(navigation);
         onFired = "";
diff --git a/addons/spike/XEH_PREP.hpp b/addons/spike/XEH_PREP.hpp
@@ -10,11 +10,11 @@ PREP(camera_switchTo);
 PREP(camera_update);
 PREP(camera_updateTargetingGate);
 PREP(camera_userInCamera);
+PREP(getTargetPosition);
 PREP(keyDown);
+PREP(mapHelperDraw);
+PREP(midCourseTransition);
+PREP(navigation);
 PREP(onFired);
 PREP(seeker);
-PREP(navigation);
-PREP(midCourseTransition);
-PREP(mapHelperDraw);
-PREP(getTargetPosition);
 
diff --git a/addons/spike/functions/fnc_onFired.sqf b/addons/spike/functions/fnc_onFired.sqf
@@ -14,6 +14,7 @@
  *
  * Public: No
  */
+
 params ["_firedEH"];
 _firedEH params ["_shooter","_weapon","","_mode","_ammo","","_projectile"];
 
diff --git a/addons/spike/initKeybinds.inc.sqf b/addons/spike/initKeybinds.inc.sqf
@@ -1,11 +1,13 @@
+#include "\a3\ui_f\hpp\defineDIKCodes.inc"
+
 ["ACE3 Weapons", QGVAR(Designate), LLSTRING(Designate),
 {
     [SPIKE_KEY_DESIGNATE, true] call FUNC(keyDown);
 },
 {
     [SPIKE_KEY_DESIGNATE, false] call FUNC(keyDown);
 },
-[15, [false, false, false]], false] call CBA_fnc_addKeybind;  // Tab
+[DIK_TAB, [false, false, false]], false] call CBA_fnc_addKeybind;  // Tab
 
 ["ACE3 Weapons", QGVAR(LeaveCamera), LLSTRING(LeaveCamera),
 {
@@ -14,7 +16,7 @@
 {
     [SPIKE_KEY_LEAVE, false] call FUNC(keyDown);
 },
-[15, [false, true, false]], false] call CBA_fnc_addKeybind;  // Ctrl+Tab
+[DIK_TAB, [false, true, false]], false] call CBA_fnc_addKeybind;  // Ctrl+Tab
 
 ["up", {
     [CAMERA_KEY_UP, true] call FUNC(keyDown);
@@ -51,7 +53,7 @@
 {
     [CAMERA_KEY_CHANGE_VISION_MODE, false] call FUNC(keyDown);
 },
-[49, [false, false, false]], false] call CBA_fnc_addKeybind;  //N
+[DIK_N, [false, false, false]], false] call CBA_fnc_addKeybind;  //N
 
 ["ACE3 Weapons", QGVAR(ZoomIn), LLSTRING(ZoomIn),
 {
@@ -60,7 +62,7 @@
 {
     [CAMERA_KEY_ZOOM_IN, false] call FUNC(keyDown);
 },
-[78, [false, false, false]], false] call CBA_fnc_addKeybind;  //Keypad+
+[DIK_ADD, [false, false, false]], false] call CBA_fnc_addKeybind;  //Keypad+
 
 ["ACE3 Weapons", QGVAR(ZoomOut), LLSTRING(ZoomOut),
 {
@@ -69,4 +71,4 @@
 {
     [CAMERA_KEY_ZOOM_OUT, false] call FUNC(keyDown);
 },
-[74, [false, false, false]], false] call CBA_fnc_addKeybind;  //Keypad-
+[DIK_SUBTRACT, [false, false, false]], false] call CBA_fnc_addKeybind;  //Keypad-

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`* Public: No`
`16`	`16`	`*/`
	`17`	`+`
`17`	`18`	`params ["_firedEH"];`
`18`	`19`	`_firedEH params ["_shooter","_weapon","","_mode","_ammo","","_projectile"];`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
	`1`	`+#include "\a3\ui_f\hpp\defineDIKCodes.inc"`
	`2`	`+`
`1`	`3`	`["ACE3 Weapons", QGVAR(Designate), LLSTRING(Designate),`
`2`	`4`	`{`
`3`	`5`	`[SPIKE_KEY_DESIGNATE, true] call FUNC(keyDown);`
`4`	`6`	`},`
`5`	`7`	`{`
`6`	`8`	`[SPIKE_KEY_DESIGNATE, false] call FUNC(keyDown);`
`7`	`9`	`},`
`8`		`-[15, [false, false, false]], false] call CBA_fnc_addKeybind; // Tab`
	`10`	`+[DIK_TAB, [false, false, false]], false] call CBA_fnc_addKeybind; // Tab`
`9`	`11`
`10`	`12`	`["ACE3 Weapons", QGVAR(LeaveCamera), LLSTRING(LeaveCamera),`
`11`	`13`	`{`
`@@ -14,7 +16,7 @@`
`14`	`16`	`{`
`15`	`17`	`[SPIKE_KEY_LEAVE, false] call FUNC(keyDown);`
`16`	`18`	`},`
`17`		`-[15, [false, true, false]], false] call CBA_fnc_addKeybind; // Ctrl+Tab`
	`19`	`+[DIK_TAB, [false, true, false]], false] call CBA_fnc_addKeybind; // Ctrl+Tab`
`18`	`20`
`19`	`21`	`["up", {`
`20`	`22`	`[CAMERA_KEY_UP, true] call FUNC(keyDown);`
`@@ -51,7 +53,7 @@`
`51`	`53`	`{`
`52`	`54`	`[CAMERA_KEY_CHANGE_VISION_MODE, false] call FUNC(keyDown);`
`53`	`55`	`},`
`54`		`-[49, [false, false, false]], false] call CBA_fnc_addKeybind; //N`
	`56`	`+[DIK_N, [false, false, false]], false] call CBA_fnc_addKeybind; //N`
`55`	`57`
`56`	`58`	`["ACE3 Weapons", QGVAR(ZoomIn), LLSTRING(ZoomIn),`
`57`	`59`	`{`
`@@ -60,7 +62,7 @@`
`60`	`62`	`{`
`61`	`63`	`[CAMERA_KEY_ZOOM_IN, false] call FUNC(keyDown);`
`62`	`64`	`},`
`63`		`-[78, [false, false, false]], false] call CBA_fnc_addKeybind; //Keypad+`
	`65`	`+[DIK_ADD, [false, false, false]], false] call CBA_fnc_addKeybind; //Keypad+`
`64`	`66`
`65`	`67`	`["ACE3 Weapons", QGVAR(ZoomOut), LLSTRING(ZoomOut),`
`66`	`68`	`{`
`@@ -69,4 +71,4 @@`
`69`	`71`	`{`
`70`	`72`	`[CAMERA_KEY_ZOOM_OUT, false] call FUNC(keyDown);`
`71`	`73`	`},`
`72`		`-[74, [false, false, false]], false] call CBA_fnc_addKeybind; //Keypad-`
	`74`	`+[DIK_SUBTRACT, [false, false, false]], false] call CBA_fnc_addKeybind; //Keypad-`