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

change some core to common

Browse Source
This commit is contained in:
bux578 2015-01-14 14:28:04 +01:00
parent c16c5e756c
commit de8ca47e88
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/ballistics/CfgWeapons.hpp
View File

@ -544,7 +544,7 @@ class CfgWeapons {
/* Flash suppressors */
class ACE_muzzle_mzls_H: ItemCore {
author = "$STR_ACE_Core_AGMTeam";
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_muzzle_mzls_H";
htMin = 1;
htMax = 600;
@ -597,7 +597,7 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_B: ACE_muzzle_mzls_H {
author = "$STR_ACE_Core_AGMTeam";
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_muzzle_mzls_B";
displayName = "$STR_ACE_muzzle_mzls_B";
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa";
@ -643,7 +643,7 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_L: ACE_muzzle_mzls_H {
author = "$STR_ACE_Core_AGMTeam";
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_muzzle_mzls_L";
displayName = "$STR_ACE_muzzle_mzls_L";
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa";
@ -689,7 +689,7 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_smg_01: ACE_muzzle_mzls_H {
author = "$STR_ACE_Core_AGMTeam";
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_muzzle_mzls_smg_01";
displayName = "$STR_ACE_muzzle_mzls_smg_01";
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa";
@ -735,7 +735,7 @@ class CfgWeapons {
};
class ACE_muzzle_mzls_smg_02: ACE_muzzle_mzls_H {
author = "$STR_ACE_Core_AGMTeam";
author = "$STR_ACE_Common_ACETeam";
_generalMacro = "ACE_muzzle_mzls_smg_02";
displayName = "$STR_ACE_muzzle_mzls_smg_02";
picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa";

6
addons/explosives/functions/fnc_openDetonateUI.sqf
View File

@ -48,8 +48,8 @@ if (_count > 0) then {
{
[
ACE_player,
[_this select 1] call EFUNC(Core,toNumber),
(ACE_player getVariable [QGVAR(Clackers), []]) select ([_this select 0] call EFUNC(Core,toNumber)),
[_this select 1] call EFUNC(common,toNumber),
(ACE_player getVariable [QGVAR(Clackers), []]) select ([_this select 0] call EFUNC(common,toNumber)),
false
] call FUNC(detonateExplosive);
call EFUNC(Interaction,hideMenu);
@ -59,5 +59,5 @@ if (_count > 0) then {
}else{
call EFUNC(Interaction,hideMenu);
[ACE_player] call FUNC(openTransmitterUI);
[localize "STR_ACE_Explosives_NoExplosivesAvailable"] call EFUNC(Core,displayTextStructured);
[localize "STR_ACE_Explosives_NoExplosivesAvailable"] call EFUNC(common,displayTextStructured);
};

2
addons/interaction/CfgVehicles.hpp
View File

@ -7,7 +7,7 @@ class CfgVehicles {
class Module_F;
class ACE_ModuleInteraction: Module_F {
author = "$STR_ACE_Core_ACETeam";
author = "$STR_ACE_Common_ACETeam";
category = "ACE";
displayName = "Interaction System";
function = "ACE_Interaction_fnc_moduleInteraction";

2
addons/interaction/config.cpp
View File

@ -39,7 +39,7 @@ class ACE_Default_Keys {
statement = QUOTE(call FUNC(onButtonDownSelf));
conditionUp = QUOTE(!isNull (findDisplay 1713999) && {profileNamespace getVariable [ARR_2(QUOTE(QGVAR(AutoCloseMenu)), false)]});
statementUp = QUOTE(if (EGVAR(interaction,MenuType) mod 2 == 1) then {call FUNC(onButtonUp)};);
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Medical_canTreat", "ACE_Interaction_isNotEscorting", "ACE_Interaction_isNotSwimming", "ACE_Core_notOnMap"};
exceptions[] = {"ACE_Drag_isNotDragging", "ACE_Medical_canTreat", "ACE_Interaction_isNotEscorting", "ACE_Interaction_isNotSwimming", "ACE_Common_notOnMap"};
key = 219;
shift = 0;
control = 1;

2
addons/switchunits/CfgVehicles.hpp
View File

@ -1,7 +1,7 @@
class CfgVehicles {
class Module_F;
class ACE_ModuleSwitchUnits: Module_F {
author = "$STR_ACE_Core_ACETeam";
author = "$STR_ACE_Common_ACETeam";
category = "ACE";
displayName = "SwitchUnits System";
function = FUNC(module);