Merge pull request #1773 from CBATeam/220dik

Keybinding - Use DIK codes from 2.20 hotfix

Author: PabstMirror

addons/keybinding/XEH_preStart.sqf

@@ -1,33 +1,5 @@
 #include "script_component.hpp"
 
-#ifndef DIK_F16
-#define DIK_F16 0x67
-#endif
-#ifndef DIK_F17
-#define DIK_F17 0x68
-#endif
-#ifndef DIK_F18
-#define DIK_F18 0x69
-#endif
-#ifndef DIK_F19
-#define DIK_F19 0x6a
-#endif
-#ifndef DIK_F20
-#define DIK_F20 0x6b
-#endif
-#ifndef DIK_F21
-#define DIK_F21 0x6c
-#endif
-#ifndef DIK_F22
-#define DIK_F22 0x6d
-#endif
-#ifndef DIK_F23
-#define DIK_F23 0x6e
-#endif
-#ifndef DIK_F24
-#define DIK_F24 0x76
-#endif
-
 if (!hasInterface) exitWith {};
 
 #include "XEH_PREP.hpp"

include/a3/ui_f/hpp/defineDIKCodes.inc

@@ -97,6 +97,16 @@
 #define DIK_F14             0x65    /*                     (NEC PC98) */
 #define DIK_F15             0x66    /*                     (NEC PC98) */
 
+#define DIK_F16             0x67
+#define DIK_F17             0x68
+#define DIK_F18             0x69
+#define DIK_F19             0x6A
+#define DIK_F20             0x6B
+#define DIK_F21             0x6C
+#define DIK_F22             0x6D
+#define DIK_F23             0x6E
+#define DIK_F24             0x76
+
 #define DIK_KANA            0x70    /* (Japanese keyboard)            */
 #define DIK_ABNT_C1         0x73    /* / ? on Portugese (Brazilian) keyboards */
 #define DIK_CONVERT         0x79    /* (Japanese keyboard)            */

include/a3/ui_f/hpp/defineResincl.inc

@@ -315,6 +315,8 @@ enum
 #define CT_ITEMSLOT         103
 #define CT_CHECKBOX         77
 #define CT_VEHICLE_DIRECTION 105
+#define CT_WEBBROWSER       106
+#define CT_EXTENSION        107
 
 // Static styles
 #define ST_POS            0x0F
@@ -410,6 +412,8 @@ enum
 #define IDC_RESTART       5
 #define IDC_USER_BUTTON   6
 #define IDC_EXIT_TO_MAIN  7
+#define IDC_EXIT_QUIT     8
+#define IDC_USER_BUTTON2  9
 
 // my own control window for tests
 #define IDC_MY_FIRST_LISTBOX    110
@@ -1024,6 +1028,9 @@ enum
 #define IDC_MAIN_QUICKPLAY          154
 #define IDC_MAIN_UNIT               155
 
+#define IDC_MAIN_INFO_BRANCH		156
+#define IDC_MAIN_BRANCH_NAME		160
+
 #define IDC_MAIN_CARDAS_CUDL        199 // muj vlastni cudl
 
 #define IDC_MAIN_VIDEOCONTROL       3335
@@ -1380,6 +1387,7 @@ enum
 #define IDC_OPTIONS_PP_DOF_SLIDER            1317
 #define IDC_OPTIONS_PP_DOF_VALUE             1318
 #define IDC_OPTIONS_PP_CAUSTICS              1319
+#define IDC_OPTIONS_PP_HAZE                  1329
 #define IDC_OPTIONS_PP_SHARPEN_SLIDER        1320
 #define IDC_OPTIONS_PP_SHARPEN_VALUE         1321
 #define IDC_OPTIONS_PP_COLOR_CORRECTIONS     1322
@@ -1415,6 +1423,7 @@ enum
 #define IDC_OPTIONS_WIND_INFLUENCE_DYN_RTD  149
 #define IDC_OPTIONS_AUTO_TRIM_RTD           150
 #define IDC_OPTIONS_STRESS_DAMAGE_RTD       151
+#define IDC_OPTIONS_WEBBROWSER				152
 
 #define IDC_PARTICLES_EFFECTS         143
 #define IDC_OPTIONS_DYNAMIC_LIGHTS    144