Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved sendDisplay & sendMessage functions to GUI instead of common.

Browse Source
This commit is contained in:
Thomas Kooi 2015-01-17 13:03:51 +01:00
parent e5579f1c32
commit 38947ba669
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/common/XEH_preInit.sqf
View File

@ -195,10 +195,6 @@ PREP(getDefinedVariable);
PREP(getAllDefinedSetVariables); PREP(getAllDefinedSetVariables);
PREP(getDefinedVariableInfo); PREP(getDefinedVariableInfo);
PREP(getDefinedVariableDefault); PREP(getDefinedVariableDefault);
PREP(sendHintTo);
PREP(sendMessageTo);
PREP(sendDisplayInformationTo);
PREP(sendDisplayMessageTo);
PREP(getDeathAnim); PREP(getDeathAnim);
PREP(insertionSort); PREP(insertionSort);
PREP(uniqueElementsOnly); PREP(uniqueElementsOnly);

4
addons/gui/XEH_preInit.sqf
View File

@ -20,5 +20,9 @@ PREP(displayIcon);
PREP(effectPain); PREP(effectPain);
PREP(effectBleeding); PREP(effectBleeding);
PREP(effectBlackOut); PREP(effectBlackOut);
PREP(sendHintTo);
PREP(sendMessageTo);
PREP(sendDisplayInformationTo);
PREP(sendDisplayMessageTo);
ADDON = true; ADDON = true;

1
addons/common/functions/fnc_sendDisplayInformationTo.sqf → addons/gui/functions/fnc_sendDisplayInformationTo.sqf
View File

@ -21,7 +21,6 @@ if (isPlayer _reciever) then {
if (!local _reciever) then { if (!local _reciever) then {
[_this, QUOTE(FUNC(sendDisplayInformationTo)), _reciever, false] call EFUNC(common,execRemoteFnc); [_this, QUOTE(FUNC(sendDisplayInformationTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
} else { } else {
if (isLocalized _title) then { if (isLocalized _title) then {
_title = localize _title; _title = localize _title;
}; };

2
addons/common/functions/fnc_sendDisplayMessageTo.sqf → addons/gui/functions/fnc_sendDisplayMessageTo.sqf
View File

@ -17,8 +17,6 @@ _content = [_this, 2, "",[""]] call BIS_fnc_Param;
_type = [_this, 3, 0,[0]] call BIS_fnc_Param; _type = [_this, 3, 0,[0]] call BIS_fnc_Param;
_parameters = [_this, 4, [], [[]]] call BIS_fnc_Param; _parameters = [_this, 4, [], [[]]] call BIS_fnc_Param;
[_this] call FUNC(debug);
if (isPlayer _reciever) then { if (isPlayer _reciever) then {
if (!local _reciever) then { if (!local _reciever) then {
[_this, QUOTE(FUNC(sendDisplayMessageTo)), _reciever, false] call EFUNC(common,execRemoteFnc); [_this, QUOTE(FUNC(sendDisplayMessageTo)), _reciever, false] call EFUNC(common,execRemoteFnc);

8
addons/common/functions/fnc_sendHintTo.sqf → addons/gui/functions/fnc_sendHintTo.sqf
View File

@ -13,12 +13,14 @@
private ["_reciever","_message"]; private ["_reciever","_message"];
_reciever = _this select 0; _reciever = _this select 0;
_message = _this select 1; _message = _this select 1;
//[_reciever,_message] call cms_fnc_sendChatMessageTo;
if (isPlayer _reciever) then { if (isPlayer _reciever) then {
if (!local _reciever) then { if (!local _reciever) then {
[_this, QUOTE(FUNC(sendHintTo)), _reciever, false] spawn EFUNC(common,execRemoteFnc); [_this, QUOTE(FUNC(sendHintTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
} else { } else {
hintsilent format ["%1",_message]; if (isLocalized _message) then {
_message = localize _message;
};
hintsilent format ["%1",_message];
}; };
}; };

9
addons/common/functions/fnc_sendMessageTo.sqf → addons/gui/functions/fnc_sendMessageTo.sqf
View File

@ -17,8 +17,15 @@ _message = _this select 1;
if (isPlayer _reciever) then { if (isPlayer _reciever) then {
if (!local _reciever) then { if (!local _reciever) then {
[_this, QUOTE(FUNC(sendMessageTo)), _reciever, false] spawn EFUNC(common,execRemoteFnc); [_this, QUOTE(FUNC(sendMessageTo)), _reciever, false] call EFUNC(common,execRemoteFnc);
} else { } else {
if (isnil QGVAR(LOGIC_OBJECT)) exitwith {
// need to create an object instead
};
if (isLocalized _message) then {
_message = localize _message;
};
GVAR(LOGIC_OBJECT) globalChat format ["%1",_message]; GVAR(LOGIC_OBJECT) globalChat format ["%1",_message];
}; };
}; };