diff --git a/addons/adminMessages/XEH_PREP.hpp b/addons/adminMessages/XEH_PREP.hpp
new file mode 100644
index 0000000..d9508e4
--- /dev/null
+++ b/addons/adminMessages/XEH_PREP.hpp
@@ -0,0 +1,8 @@
+PREP(displayMessage);
+PREP(initListbox);
+PREP(isAdminOrZeus);
+PREP(onRecipientChanged);
+PREP(receiveMessage);
+PREP(sendMessage);
+PREP(setSendButtonPosition);
+PREP(setTitle);
\ No newline at end of file
diff --git a/addons/adminMessages/XEH_preInit.sqf b/addons/adminMessages/XEH_preInit.sqf
new file mode 100644
index 0000000..b47cf66
--- /dev/null
+++ b/addons/adminMessages/XEH_preInit.sqf
@@ -0,0 +1,9 @@
+#include "script_component.hpp"
+
+ADDON = false;
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+ADDON = true;
diff --git a/addons/adminMessages/XEH_preStart.sqf b/addons/adminMessages/XEH_preStart.sqf
new file mode 100644
index 0000000..0228885
--- /dev/null
+++ b/addons/adminMessages/XEH_preStart.sqf
@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
diff --git a/addons/adminMessages/cfgEventHandlers.hpp b/addons/adminMessages/cfgEventHandlers.hpp
index f1f55a3..ddcab12 100644
--- a/addons/adminMessages/cfgEventHandlers.hpp
+++ b/addons/adminMessages/cfgEventHandlers.hpp
@@ -7,5 +7,12 @@ class Extended_PostInit_EventHandlers {
class Extended_PreInit_EventHandlers {
class ADDON {
clientInit = QUOTE(call COMPILE_FILE(XEH_preClientInit));
+ init = QUOTE(call COMPILE_FILE(XEH_preInit));
+ };
+};
+
+class Extended_PreStart_EventHandlers {
+ class ADDON {
+ init = QUOTE(call COMPILE_FILE(XEH_preStart));
};
};
diff --git a/addons/adminMessages/cfgFunctions.hpp b/addons/adminMessages/cfgFunctions.hpp
deleted file mode 100644
index 21a67b5..0000000
--- a/addons/adminMessages/cfgFunctions.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-class CfgFunctions {
- class grad_adminMessages {
- class adminMessages {
- file = "x\grad_adminMessages\addons\adminMessages\functions";
-
- class displayMessage {};
- class initListbox {};
- class isAdminOrZeus {};
- class onRecipientChanged {};
- class receiveMessage {};
- class sendMessage {};
- class setSendButtonPosition {};
- class setTitle {};
- };
- };
-};
diff --git a/addons/adminMessages/config.cpp b/addons/adminMessages/config.cpp
index 967b138..f85b9fd 100644
--- a/addons/adminMessages/config.cpp
+++ b/addons/adminMessages/config.cpp
@@ -15,7 +15,6 @@ class CfgPatches {
};
#include "cfgEventHandlers.hpp"
-#include "cfgFunctions.hpp"
#include "gui\defines.hpp"
#include "gui\sendBoxBase.hpp"
diff --git a/addons/adminMessages/functions/fn_receiveMessage.sqf b/addons/adminMessages/functions/fn_receiveMessage.sqf
deleted file mode 100644
index 3b64d5f..0000000
--- a/addons/adminMessages/functions/fn_receiveMessage.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "script_component.hpp"
-
-params ["_sender","_UID","_message",["_receiveCondition",{[] call grad_adminMessages_fnc_isAdminOrZeus}],["_receiveConditionParams",[]]];
-
-if !(hasInterface) exitWith {};
-if !(_receiveConditionParams call _receiveCondition) exitWith {};
-if (profileName == _sender) exitWith {};
-
-if (isNil "grad_adminMessages_latestConvos") then {grad_adminMessages_latestConvos = []};
-if (grad_adminMessages_latestConvos find [toUpper _sender,_UID] < 0) then {
- reverse grad_adminMessages_latestConvos;
- grad_adminMessages_latestConvos pushBack [toUpper _sender,_UID];
- reverse grad_adminMessages_latestConvos;
-};
-if (count grad_adminMessages_latestConvos > 5) then {grad_adminMessages_latestConvos resize 5};
-
-[_sender,_message] call FUNC(displayMessage);
-
-playSound "3DEN_notificationWarning";
diff --git a/addons/adminMessages/functions/fn_displayMessage.sqf b/addons/adminMessages/functions/fnc_displayMessage.sqf
similarity index 97%
rename from addons/adminMessages/functions/fn_displayMessage.sqf
rename to addons/adminMessages/functions/fnc_displayMessage.sqf
index faadb93..b320b28 100644
--- a/addons/adminMessages/functions/fn_displayMessage.sqf
+++ b/addons/adminMessages/functions/fnc_displayMessage.sqf
@@ -1,37 +1,37 @@
-#include "script_component.hpp"
-#include "..\gui\defines.hpp"
-
-params [["_info",""],["_message",""]];
-
-// chat is disabled by grad_minui >> display message in custom rscTitle
-if (
- !isNil "grad_minui_fnc_setting" &&
- {
- (!visibleMap && !(["chat_enabled"] call grad_minui_fnc_setting)) ||
- (visibleMap && !(["chat_enabled_map"] call grad_minui_fnc_setting))
- }
-) then {
-
- QGVAR(customChatLayer) cutRsc [QGVAR(rscCustomChat),"PLAIN",-1,true];
- private _customChatTitleDisplay = uiNamespace getVariable [QGVAR(rscCustomChat),displayNull];
- private _ctrlText = _customChatTitleDisplay displayCtrl GA_ADMINMESSAGES_IDC_CUSTOMCHATTEXT;
-
- _ctrlText ctrlSetStructuredText parseText format ["%1 %2",format [localize "STR_grad_ADMINMESSAGES_CHANNEL",_info],_message];
-
- private _textHeight = ctrlTextHeight _ctrlText;
- /* private _textWidth = ctrlTextWidth _ctrlText; */
-
- (ctrlPosition _ctrlText) params ["_origX","_origY","_origW"];
-
- _ctrlText ctrlSetPosition [_origX,_origY - _textHeight,_origW,_textHeight];
- _ctrlText ctrlCommit 0;
-
-};
-
-
-// add message to chat either way >> user can check chat history on map, if enabled
-GVAR(channel) radioChannelAdd [player];
-GVAR(channel) radioChannelSetCallsign format [localize "STR_grad_ADMINMESSAGES_CHANNEL",_info];
-
-player customChat [GVAR(channel), _message];
-GVAR(channel) radioChannelRemove [player];
+#include "script_component.hpp"
+#include "..\gui\defines.hpp"
+
+params [["_info",""],["_message",""]];
+
+// chat is disabled by grad_minui >> display message in custom rscTitle
+if (
+ !isNil "grad_minui_fnc_setting" &&
+ {
+ (!visibleMap && !(["chat_enabled"] call grad_minui_fnc_setting)) ||
+ (visibleMap && !(["chat_enabled_map"] call grad_minui_fnc_setting))
+ }
+) then {
+
+ QGVAR(customChatLayer) cutRsc [QGVAR(rscCustomChat),"PLAIN",-1,true];
+ private _customChatTitleDisplay = uiNamespace getVariable [QGVAR(rscCustomChat),displayNull];
+ private _ctrlText = _customChatTitleDisplay displayCtrl GA_ADMINMESSAGES_IDC_CUSTOMCHATTEXT;
+
+ _ctrlText ctrlSetStructuredText parseText format ["%1 %2",format [localize "STR_grad_ADMINMESSAGES_CHANNEL",_info],_message];
+
+ private _textHeight = ctrlTextHeight _ctrlText;
+ /* private _textWidth = ctrlTextWidth _ctrlText; */
+
+ (ctrlPosition _ctrlText) params ["_origX","_origY","_origW"];
+
+ _ctrlText ctrlSetPosition [_origX,_origY - _textHeight,_origW,_textHeight];
+ _ctrlText ctrlCommit 0;
+
+};
+
+
+// add message to chat either way >> user can check chat history on map, if enabled
+GVAR(channel) radioChannelAdd [player];
+GVAR(channel) radioChannelSetCallsign format [localize "STR_grad_ADMINMESSAGES_CHANNEL",_info];
+
+player customChat [GVAR(channel), _message];
+GVAR(channel) radioChannelRemove [player];
diff --git a/addons/adminMessages/functions/fn_initListbox.sqf b/addons/adminMessages/functions/fnc_initListbox.sqf
similarity index 85%
rename from addons/adminMessages/functions/fn_initListbox.sqf
rename to addons/adminMessages/functions/fnc_initListbox.sqf
index 079ac99..aec2052 100644
--- a/addons/adminMessages/functions/fn_initListbox.sqf
+++ b/addons/adminMessages/functions/fnc_initListbox.sqf
@@ -1,73 +1,75 @@
-#include "script_component.hpp"
-
-params [["_ctrl",controlNull]];
-
-if !([] call grad_adminMessages_fnc_isAdminOrZeus) exitWith {_ctrl ctrlShow false};
-
-private _fnc_getHeadlineText = {
- params ["_locStr"];
- private _text = localize _locStr;
- _text = _text + " =======================================================================================";
- _text = [_text,0,30] call BIS_fnc_trimString;
- _text
-};
-
-private _fnc_addEntry = {
- params ["_text","_data"];
- private _index = _ctrl lbAdd _text;
- _ctrl lbSetData [_index,if !(_data isEqualType "") then {str _data} else {_data}];
- _index
-};
-
-private _fnc_addHeadline = {
- params ["_locStr"];
- private _index = [[_locStr] call _fnc_getHeadlineText,-1] call _fnc_addEntry;
- _ctrl lbSetColor [_index,[0.7,0.7,0.7,1]];
-};
-
-
-//LATEST CONVERSATIONS =========================================================
-if (!isNil "grad_adminMessages_latestConvos" && {count grad_adminMessages_latestConvos > 0}) then {
- ["STR_grad_ADMINMESSAGES_LATESTCONVOS"] call _fnc_addHeadline;
- {
- _x call _fnc_addEntry;
- false
- } count grad_adminMessages_latestConvos;
- ["",-1] call _fnc_addEntry;
-};
-
-
-//BY SIDE ======================================================================
-["STR_grad_ADMINMESSAGES_BYCATEGORY"] call _fnc_addHeadline;
-[localize "STR_grad_ADMINMESSAGES_EVERYONE",-2] call _fnc_addEntry;
-[localize "STR_grad_ADMINMESSAGES_OTHERADMINS",-3] call _fnc_addEntry;
-["BLUFOR",-4] call _fnc_addEntry;
-["OPFOR",-5] call _fnc_addEntry;
-["INDEPENDENT",-6] call _fnc_addEntry;
-["CIVILIAN",-7] call _fnc_addEntry;
-["",-1] call _fnc_addEntry;
-
-
-//LIST OF PLAYERS ==============================================================
-["STR_grad_ADMINMESSAGES_BYPLAYER"] call _fnc_addHeadline;
-private _playerData = [];
-{
- _playerData pushBack [toUpper ([_x,true] call BIS_fnc_getName),getPlayerUID _x];
- false
-} count ([] call CBA_fnc_players);
-_playerData sort false;
-
-{
- _x call _fnc_addEntry;
- false
-} count _playerData;
-
-
-//SET CURSEL ===================================================================
-if (lbCurSel _ctrl < 0 || lbCurSel _ctrl >= lbSize _ctrl) then {
- _ctrl lbSetCurSel 1;
-} else {
- if (call compile (_ctrl lbData (lbCursel _ctrl)) < 0) then {
- _ctrl lbSetCurSel 1;
- };
-};
+#include "script_component.hpp"
+
+params [["_ctrl", controlNull]];
+
+uiNamespace setVariable [QGVAR(sendBoxListboxCtrl), _ctrl];
+
+if !([] call FUNC(isAdminOrZeus)) exitWith {_ctrl ctrlShow false};
+
+private _fnc_getHeadlineText = {
+ params ["_locStr"];
+ private _text = localize _locStr;
+ _text = _text + " =======================================================================================";
+ _text = [_text,0,30] call BIS_fnc_trimString;
+ _text
+};
+
+private _fnc_addEntry = {
+ params ["_text","_data"];
+ private _index = _ctrl lbAdd _text;
+ _ctrl lbSetData [_index,if !(_data isEqualType "") then {str _data} else {_data}];
+ _index
+};
+
+private _fnc_addHeadline = {
+ params ["_locStr"];
+ private _index = [[_locStr] call _fnc_getHeadlineText,-1] call _fnc_addEntry;
+ _ctrl lbSetColor [_index,[0.7,0.7,0.7,1]];
+};
+
+
+//LATEST CONVERSATIONS =========================================================
+if (!isNil QGVAR(latestConvos) && {count GVAR(latestConvos) > 0}) then {
+ ["STR_grad_ADMINMESSAGES_LATESTCONVOS"] call _fnc_addHeadline;
+ {
+ _x call _fnc_addEntry;
+ false
+ } count GVAR(latestConvos);
+ ["",-1] call _fnc_addEntry;
+};
+
+
+//BY SIDE ======================================================================
+["STR_grad_ADMINMESSAGES_BYCATEGORY"] call _fnc_addHeadline;
+[localize "STR_grad_ADMINMESSAGES_EVERYONE",-2] call _fnc_addEntry;
+[localize "STR_grad_ADMINMESSAGES_OTHERADMINS",-3] call _fnc_addEntry;
+["BLUFOR",-4] call _fnc_addEntry;
+["OPFOR",-5] call _fnc_addEntry;
+["INDEPENDENT",-6] call _fnc_addEntry;
+["CIVILIAN",-7] call _fnc_addEntry;
+["",-1] call _fnc_addEntry;
+
+
+//LIST OF PLAYERS ==============================================================
+["STR_grad_ADMINMESSAGES_BYPLAYER"] call _fnc_addHeadline;
+private _playerData = [];
+{
+ _playerData pushBack [toUpper ([_x,true] call BIS_fnc_getName),getPlayerUID _x];
+ false
+} count ([] call CBA_fnc_players);
+_playerData sort false;
+
+{
+ _x call _fnc_addEntry;
+ false
+} count _playerData;
+
+
+//SET CURSEL ===================================================================
+if (lbCurSel _ctrl < 0 || lbCurSel _ctrl >= lbSize _ctrl) then {
+ _ctrl lbSetCurSel 1;
+} else {
+ if (call compile (_ctrl lbData (lbCursel _ctrl)) < 0) then {
+ _ctrl lbSetCurSel 1;
+ };
+};
diff --git a/addons/adminMessages/functions/fn_isAdminOrZeus.sqf b/addons/adminMessages/functions/fnc_isAdminOrZeus.sqf
similarity index 96%
rename from addons/adminMessages/functions/fn_isAdminOrZeus.sqf
rename to addons/adminMessages/functions/fnc_isAdminOrZeus.sqf
index a768405..174402b 100644
--- a/addons/adminMessages/functions/fn_isAdminOrZeus.sqf
+++ b/addons/adminMessages/functions/fnc_isAdminOrZeus.sqf
@@ -1,4 +1,4 @@
-#include "script_component.hpp"
-
-serverCommandAvailable "#kick" ||
-!isNull (getAssignedCuratorlogic player)
+#include "script_component.hpp"
+
+serverCommandAvailable "#kick" ||
+!isNull (getAssignedCuratorlogic player)
diff --git a/addons/adminMessages/functions/fn_onRecipientChanged.sqf b/addons/adminMessages/functions/fnc_onRecipientChanged.sqf
similarity index 64%
rename from addons/adminMessages/functions/fn_onRecipientChanged.sqf
rename to addons/adminMessages/functions/fnc_onRecipientChanged.sqf
index 4975c3c..00e8167 100644
--- a/addons/adminMessages/functions/fn_onRecipientChanged.sqf
+++ b/addons/adminMessages/functions/fnc_onRecipientChanged.sqf
@@ -1,15 +1,15 @@
-#include "script_component.hpp"
-
-params [["_ctrl",controlNull],["_selID",-1]];
-
-private _data = call compile (_ctrl lbData _selID);
-
-private _sendButton = uiNamespace getVariable ["grad_adminMessages_sendBoxButtonCtrl",controlNull];
-
-if (!(_data isEqualType 0) || {_data == -1}) then {
- _sendButton ctrlEnable false;
- _sendButton ctrlSetText (localize "STR_grad_ADMINMESSAGES_SELECTVALIDRECIP");
-} else {
- _sendButton ctrlEnable true;
- _sendButton ctrlSetText format [(localize "STR_grad_ADMINMESSAGES_SENDTO"),_ctrl lbText _selID];
-};
+#include "script_component.hpp"
+
+params [["_ctrl", controlNull],["_selID", -1]];
+
+private _data = call compile (_ctrl lbData _selID);
+
+private _sendButton = uiNamespace getVariable [QGVAR(sendBoxButtonCtrl), controlNull];
+
+if (!(_data isEqualType 0) || {_data == -1}) then {
+ _sendButton ctrlEnable false;
+ _sendButton ctrlSetText (localize "STR_grad_ADMINMESSAGES_SELECTVALIDRECIP");
+} else {
+ _sendButton ctrlEnable true;
+ _sendButton ctrlSetText format [(localize "STR_grad_ADMINMESSAGES_SENDTO"), _ctrl lbText _selID];
+};
diff --git a/addons/adminMessages/functions/fnc_receiveMessage.sqf b/addons/adminMessages/functions/fnc_receiveMessage.sqf
new file mode 100644
index 0000000..90cb378
--- /dev/null
+++ b/addons/adminMessages/functions/fnc_receiveMessage.sqf
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+
+params ["_sender", "_UID", "_message", ["_receiveCondition",{[] call FUNC(isAdminOrZeus)}], ["_receiveConditionParams",[]]];
+
+if !(hasInterface) exitWith {};
+if !(_receiveConditionParams call _receiveCondition) exitWith {};
+if (profileName == _sender) exitWith {};
+
+if (isNil QGVAR(latestConvos)) then {GVAR(latestConvos) = []};
+if (GVAR(latestConvos) find [toUpper _sender,_UID] < 0) then {
+ reverse GVAR(latestConvos);
+ GVAR(latestConvos) pushBack [toUpper _sender,_UID];
+ reverse GVAR(latestConvos);
+};
+if (count GVAR(latestConvos) > 5) then {GVAR(latestConvos) resize 5};
+
+[_sender,_message] call FUNC(displayMessage);
+
+playSound "3DEN_notificationWarning";
diff --git a/addons/adminMessages/functions/fn_sendMessage.sqf b/addons/adminMessages/functions/fnc_sendMessage.sqf
similarity index 70%
rename from addons/adminMessages/functions/fn_sendMessage.sqf
rename to addons/adminMessages/functions/fnc_sendMessage.sqf
index e3fe8f6..78bc2af 100644
--- a/addons/adminMessages/functions/fn_sendMessage.sqf
+++ b/addons/adminMessages/functions/fnc_sendMessage.sqf
@@ -1,49 +1,49 @@
-#include "script_component.hpp"
-
-private _editBox = uiNamespace getVariable ["grad_adminMessages_sendBoxCtrl",controlNull];
-private _listbox = uiNamespace getVariable ["grad_adminMessages_sendBoxListboxCtrl",controlNull];
-
-if (isNull _editBox || isNull _listbox) exitWith {};
-
-private _message = ctrlText _editBox;
-if (_message == "") exitWith {};
-
-_editBox ctrlSetText "";
-
-if ([] call grad_adminMessages_fnc_isAdminOrZeus) then {
-
- private _lbCurSel = lbCurSel _listbox;
- private _lbData = _listbox lbData _lbCurSel;
- private _lbText = _listbox lbText _lbCurSel;
- private _receiveConditionParams = [];
-
- private _receiveCondition = if ((call compile _lbData) < 0) then {
- switch (call compile _lbData) do {
- case (-2): {{true}}; //EVERYONE
- case (-3): {{[] call grad_adminMessages_fnc_isAdminOrZeus}}; //OTHER ADMINS AND ZEUS
- case (-4): {{playerSide == WEST}};
- case (-5): {{playerSide == EAST}};
- case (-6): {{playerSide == INDEPENDENT}};
- case (-7): {{playerSide == CIVILIAN}};
- default {{false}};
- }
- } else {
- _receiveConditionParams = [_lbData];
- {getPlayerUID player == (_this select 0)}
- };
-
- // display sent message locally
- [format ["%1 %2",localize "STR_grad_ADMINMESSAGES_TO",_lbText],_message] call FUNC(displayMessage);
-
- // send message to recipient
- [profileName,getPlayerUID player,_message,_receiveCondition,_receiveConditionParams] remoteExec ["grad_adminMessages_fnc_receiveMessage",0,false];
-
-} else {
- // display sent message locally
- [format ["%1 %2",localize "STR_grad_ADMINMESSAGES_TO","Admin"],_message] call FUNC(displayMessage);
-
- // send message to recipient
- [profileName,getPlayerUID player,_message] remoteExec ["grad_adminMessages_fnc_receiveMessage",0,false];
-};
-
-playSound "3DEN_notificationDefault";
+#include "script_component.hpp"
+
+private _editBox = uiNamespace getVariable [QGVAR(sendBoxCtrl), controlNull];
+private _listbox = uiNamespace getVariable [QGVAR(sendBoxListboxCtrl), controlNull];
+
+if (isNull _editBox || isNull _listbox) exitWith {};
+
+private _message = ctrlText _editBox;
+if (_message == "") exitWith {};
+
+_editBox ctrlSetText "";
+
+if ([] call FUNC(isAdminOrZeus)) then {
+
+ private _lbCurSel = lbCurSel _listbox;
+ private _lbData = _listbox lbData _lbCurSel;
+ private _lbText = _listbox lbText _lbCurSel;
+ private _receiveConditionParams = [];
+
+ private _receiveCondition = if ((call compile _lbData) < 0) then {
+ switch (call compile _lbData) do {
+ case (-2): {{true}}; //EVERYONE
+ case (-3): {{[] call FUNC(isAdminOrZeus)}}; //OTHER ADMINS AND ZEUS
+ case (-4): {{playerSide == WEST}};
+ case (-5): {{playerSide == EAST}};
+ case (-6): {{playerSide == INDEPENDENT}};
+ case (-7): {{playerSide == CIVILIAN}};
+ default {{false}};
+ }
+ } else {
+ _receiveConditionParams = [_lbData];
+ {getPlayerUID player == (_this select 0)}
+ };
+
+ // display sent message locally
+ [format ["%1 %2",localize "STR_grad_ADMINMESSAGES_TO",_lbText],_message] call FUNC(displayMessage);
+
+ // send message to recipient
+ [profileName,getPlayerUID player,_message,_receiveCondition,_receiveConditionParams] remoteExec [QFUNC(receiveMessage), 0, false];
+
+} else {
+ // display sent message locally
+ [format ["%1 %2",localize "STR_grad_ADMINMESSAGES_TO","Admin"],_message] call FUNC(displayMessage);
+
+ // send message to recipient
+ [profileName,getPlayerUID player,_message] remoteExec [QFUNC(receiveMessage),0,false];
+};
+
+playSound "3DEN_notificationDefault";
diff --git a/addons/adminMessages/functions/fn_setSendButtonPosition.sqf b/addons/adminMessages/functions/fnc_setSendButtonPosition.sqf
similarity index 54%
rename from addons/adminMessages/functions/fn_setSendButtonPosition.sqf
rename to addons/adminMessages/functions/fnc_setSendButtonPosition.sqf
index de0dd55..2a2d4b6 100644
--- a/addons/adminMessages/functions/fn_setSendButtonPosition.sqf
+++ b/addons/adminMessages/functions/fnc_setSendButtonPosition.sqf
@@ -1,9 +1,11 @@
-#include "script_component.hpp"
-#include "..\gui\defines.hpp"
-
-params [["_ctrl",controlNull]];
-
-if !([] call grad_adminMessages_fnc_isAdminOrZeus) exitWith {};
-
-_ctrl ctrlSetPosition [GA_ADMINMESSAGES_TITLE_X,GA_ADMINMESSAGES_SENDBUTTON_Y_2];
-_ctrl ctrlCommit 0;
+#include "script_component.hpp"
+#include "..\gui\defines.hpp"
+
+params [["_ctrl", controlNull]];
+
+uiNamespace setVariable [QGVAR(sendBoxButtonCtrl), _ctrl];
+
+if !([] call FUNC(isAdminOrZeus)) exitWith {};
+
+_ctrl ctrlSetPosition [GA_ADMINMESSAGES_TITLE_X,GA_ADMINMESSAGES_SENDBUTTON_Y_2];
+_ctrl ctrlCommit 0;
diff --git a/addons/adminMessages/functions/fn_setTitle.sqf b/addons/adminMessages/functions/fnc_setTitle.sqf
similarity index 72%
rename from addons/adminMessages/functions/fn_setTitle.sqf
rename to addons/adminMessages/functions/fnc_setTitle.sqf
index ae66230..6a8f5f3 100644
--- a/addons/adminMessages/functions/fn_setTitle.sqf
+++ b/addons/adminMessages/functions/fnc_setTitle.sqf
@@ -1,11 +1,11 @@
-#include "script_component.hpp"
-
-params [["_ctrl",controlNull]];
-
-private _text = if ([] call grad_adminMessages_fnc_isAdminOrZeus) then {
- localize "STR_grad_ADMINMESSAGES_SENDBOXTITLEADMIN"
-} else {
- localize "STR_grad_ADMINMESSAGES_SENDBOXTITLEPLAYER"
-};
-
-_ctrl ctrlSetText _text
+#include "script_component.hpp"
+
+params [["_ctrl",controlNull]];
+
+private _text = if ([] call FUNC(isAdminOrZeus)) then {
+ localize "STR_grad_ADMINMESSAGES_SENDBOXTITLEADMIN"
+} else {
+ localize "STR_grad_ADMINMESSAGES_SENDBOXTITLEPLAYER"
+};
+
+_ctrl ctrlSetText _text
diff --git a/addons/adminMessages/gui/sendBoxBase.hpp b/addons/adminMessages/gui/sendBoxBase.hpp
index f1e2460..f36fa21 100644
--- a/addons/adminMessages/gui/sendBoxBase.hpp
+++ b/addons/adminMessages/gui/sendBoxBase.hpp
@@ -8,7 +8,7 @@ class ga_adminMessages_sendBoxTitleBase: RscTitle {
idc = -1;
style = 0;
- onLoad = "_this call grad_adminMessages_fnc_setTitle";
+ onLoad = QUOTE(_this call FUNC(setTitle));
text = "ERROR ";
colorBackground[] = {
@@ -44,10 +44,10 @@ class ga_adminMessages_sendBoxBase: RscEdit {
font = "EtelkaMonospacePro";
sizeEx = "0.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
- onLoad = "uiNamespace setVariable [""grad_adminMessages_sendBoxCtrl"", (_this select 0)]";
- onUnLoad = "uiNamespace setVariable [""grad_adminMessages_sendBoxCtrl"", nil]";
+ onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(sendBoxCtrl), (_this select 0))]);
+ onUnLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(sendBoxCtrl), nil)]);
- onKeyDown = "if ((_this select 1) isEqualTo 28 && !(_this select 2) && !(_this select 3) && !(_this select 4)) then {call grad_adminMessages_fnc_sendMessage;};";
+ onKeyDown = QUOTE(if ((_this select 1) isEqualTo 28 && !(_this select 2) && !(_this select 3) && !(_this select 4)) then {call FUNC(sendMessage);};);
x = GA_ADMINMESSAGES_EDITBOX_X;
y = GA_ADMINMESSAGES_EDITBOX_Y;
@@ -58,11 +58,11 @@ class ga_adminMessages_sendBoxBase: RscEdit {
class ga_adminMessages_sendBoxButtonBase: RscButtonMenu {
idc = GA_ADMINMESSAGES_IDC_SENDBUTTON;
- onLoad = "uiNamespace setVariable [""grad_adminMessages_sendBoxButtonCtrl"",(_this select 0)]; _this call grad_adminMessages_fnc_setSendButtonPosition";
- onUnLoad = "uiNamespace setVariable [""grad_adminMessages_sendBoxButtonCtrl"",nil]";
+ onLoad = QUOTE( _this call FUNC(setSendButtonPosition));
+ onUnLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(sendBoxButtonCtrl), nil)]);
text = "$STR_grad_ADMINMESSAGES_SENDBOXBUTTON";
- action = "call grad_adminMessages_fnc_sendMessage";
+ action = QUOTE(call FUNC(sendMessage));
x = GA_ADMINMESSAGES_TITLE_X;
y = GA_ADMINMESSAGES_SENDBUTTON_Y;
@@ -75,11 +75,10 @@ class ga_adminMessages_sendBoxListboxBase: RscCombo {
font = "EtelkaMonospacePro";
rowHeight = 10;
- /*sizeEx = "0.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";*/
- onLoad = "uiNamespace setVariable [""grad_adminMessages_sendBoxListboxCtrl"",(_this select 0)]; _this call grad_adminMessages_fnc_initListbox";
- onUnLoad = "uiNamespace setVariable [""grad_adminMessages_sendBoxListboxCtrl"",nil]";
- onLBSelChanged = "_this call grad_adminMessages_fnc_onRecipientChanged";
+ onLoad = QUOTE(_this call FUNC(initListbox));
+ onUnLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(sendBoxListboxCtrl), nil)]);
+ onLBSelChanged = QUOTE(_this call FUNC(onRecipientChanged));
x = GA_ADMINMESSAGES_TITLE_X;
y = GA_ADMINMESSAGES_SENDBUTTON_Y;
diff --git a/addons/adminMessages/stringtable.xml b/addons/adminMessages/stringtable.xml
index 8b6a05a..d44b92d 100644
--- a/addons/adminMessages/stringtable.xml
+++ b/addons/adminMessages/stringtable.xml
@@ -29,7 +29,7 @@
-
+
LATEST CONVERSATIONS
LATEST CONVERSATIONS
AKTUELLE GESPRÄCHE
diff --git a/build-hemtt.bat b/build-hemtt.bat
index 4d71379..80dc19c 100644
--- a/build-hemtt.bat
+++ b/build-hemtt.bat
@@ -7,11 +7,11 @@ if exist a3 (
mklink /j a3 include\a3
mkdir x
-mkdir x\rnt
-if exist x\rnt\addons (
- rmdir x\rnt\addons
+mkdir x\grad_adminMessages
+if exist x\grad_adminMessages\addons (
+ rmdir x\grad_adminMessages\addons
)
-mklink /j x\rnt\addons addons
+mklink /j x\grad_adminMessages\addons addons
IF [%1] == [] (
tools\hemtt build --force --release
@@ -22,8 +22,8 @@ IF [%1] == [] (
set BUILD_STATUS=%errorlevel%
rmdir a3
-rmdir x\rnt\addons
-rmdir x\rnt
+rmdir x\grad_adminMessages\addons
+rmdir x\grad_adminMessages
rmdir x
if %BUILD_STATUS% neq 0 (