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

more macros for common

Browse Source
This commit is contained in:
commy2
2015-01-13 22:32:56 +01:00
parent e071b2f684
commit 46a0fc5631
19 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addons/common/CfgVehicles.hpp
View File

@ -15,8 +15,8 @@ class CfgVehicles {
showIn3D = 0; showIn3D = 0;
onlyForPlayer = 1; onlyForPlayer = 1;
shortcut = "DefaultAction"; shortcut = "DefaultAction";
condition = "call ACE_Common_UserActionFireCondition"; condition = QUOTE(call GVAR(UserActionFireCondition));
statement = "call ACE_Common_UserActionFire"; statement = QUOTE(call GVAR(UserActionFire));
userActionID = 100; userActionID = 100;
}; };
}; };

8
addons/common/ProgressScreen.hpp
View File

@ -1,8 +1,8 @@
class ACE_Common_ProgressBar_Dialog { class GVAR(ProgressBar_Dialog) {
idd = -1; idd = -1;
movingEnable = false; movingEnable = false;
onLoad = "uiNamespace setVariable ['ACE_Common_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Common_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];"; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBar)),(_this select 0) displayCtrl 1)]; uiNamespace setVariable [ARR_2(QUOTE(QGVAR(ctrlProgressBarTitle)),(_this select 0) displayCtrl 2)];);
objects[] = {}; objects[] = {};
class controlsBackground { class controlsBackground {
@ -66,10 +66,10 @@ class ACE_Common_ProgressBar_Dialog {
}; };
}; };
class ACE_Common_DisableMouse_Dialog { class GVAR(DisableMouse_Dialog) {
idd = -1; idd = -1;
movingEnable = false; movingEnable = false;
onLoad = "uiNamespace setVariable ['ACE_Common_dlgDisableMouse', _this select 0];"; onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgDisableMouse)),_this select 0)];);
objects[] = {}; objects[] = {};
class controlsBackground { class controlsBackground {
class Background { class Background {

2
addons/common/config.cpp
View File

@ -72,7 +72,7 @@ class ACE_Options {
/* /*
class RscControlsGroupNoScrollbars; class RscControlsGroupNoScrollbars;
class RscAttributeInventory: RscControlsGroupNoScrollbars { class RscAttributeInventory: RscControlsGroupNoScrollbars {
onSetFocus = "[_this,""RscAttributeInventory"",'CuratorCommon'] call (uinamespace getvariable ""BIS_fnc_initCuratorAttribute""); _this select 0 call ACE_Common_fnc_addCuratorUnloadEventhandler;"; onSetFocus = QUOTE([ARR_3(_this,""RscAttributeInventory"",'CuratorCommon')] call (uinamespace getvariable ""BIS_fnc_initCuratorAttribute""); _this select 0 call DFUNC(addCuratorUnloadEventhandler););
}; };
*/ */

2
addons/common/scripts/KeyInput/initCanInteractFunction.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
private ["_function", "_configFile", "_count", "_index", "_config", "_configName", "_condition"]; private ["_function", "_configFile", "_count", "_index", "_config", "_configName", "_condition"];

2
addons/common/scripts/KeyInput/initKeys.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
_config = configFile >> "ACE_Default_Keys"; _config = configFile >> "ACE_Default_Keys";
_count = count _config; _count = count _config;

2
addons/common/scripts/KeyInput/initScrollWheel.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
GVAR(ScrollWheelFrame) = diag_frameno; GVAR(ScrollWheelFrame) = diag_frameno;

1
addons/common/scripts/KeyInput/script_component.hpp Normal file
View File

@ -0,0 +1 @@
#include "\z\ace\addons\common\script_component.hpp"

4
addons/common/scripts/Version/checkVersionNumber.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
sleep 1; //wait for module sleep 1; //wait for module
@ -19,7 +19,7 @@ if (missionNamespace getVariable ["ACE_Version_CheckAll", false]) then {
} forEach activatedAddons; } forEach activatedAddons;
}; };
_versionMain = parseNumber getText (configFile >> "CfgPatches" >> "ACE_Common" >> "version"); _versionMain = parseNumber getText (configFile >> "CfgPatches" >> QUOTE(ADDON) >> "version");
_versions = []; _versions = [];
{ {

1
addons/common/scripts/Version/script_component.hpp Normal file
View File

@ -0,0 +1 @@
#include "\z\ace\addons\common\script_component.hpp"

2
addons/common/scripts/assignedItemFix.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
if (isNil "ACE_itemFix") then { if (isNil "ACE_itemFix") then {
ACE_isMapEnabled = call {_config = missionConfigFile >> "showMap"; !isNumber _config || {getNumber _config == 1}}; ACE_isMapEnabled = call {_config = missionConfigFile >> "showMap"; !isNumber _config || {getNumber _config == 1}};

2
addons/common/scripts/closeMenu.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
closeDialog 0; closeDialog 0;
[localize QUOTE(DOUBLES(STR,GVAR(ProfileNotSaved)))] call FUNC(displayTextStructured); [localize QUOTE(DOUBLES(STR,GVAR(ProfileNotSaved)))] call FUNC(displayTextStructured);

2
addons/common/scripts/editKey.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
#define GRAY [0.25, 0.25, 0.25, 1] #define GRAY [0.25, 0.25, 0.25, 1]
#define WHITE [1, 1, 1, 1] #define WHITE [1, 1, 1, 1]

2
addons/common/scripts/keyInput.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
#define FORBIDDEN_KEYS [42, 54, 29, 157, 56, 184, 0, 183, 197, 1] #define FORBIDDEN_KEYS [42, 54, 29, 157, 56, 184, 0, 183, 197, 1]

2
addons/common/scripts/keyRelease.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
_keyIndex = _this select 1; _keyIndex = _this select 1;

2
addons/common/scripts/nextKeys.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
#define OFFSET_1 100 #define OFFSET_1 100
#define OFFSET_2 200 #define OFFSET_2 200

2
addons/common/scripts/openMenu.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
#define OFFSET_1 100 #define OFFSET_1 100
#define OFFSET_2 200 #define OFFSET_2 200

2
addons/common/scripts/readParameters.sqf
View File

@ -1,5 +1,5 @@
// by CAA-Picard // by CAA-Picard
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
// Read ACE_Parameters from config and set them on the mission namespace // Read ACE_Parameters from config and set them on the mission namespace
_config = configFile >> "ACE_Parameters_Numeric"; _config = configFile >> "ACE_Parameters_Numeric";

1
addons/common/scripts/script_component.hpp Normal file
View File

@ -0,0 +1 @@
#include "\z\ace\addons\common\script_component.hpp"

2
addons/common/scripts/toggleState.sqf
View File

@ -1,5 +1,5 @@
// by commy2 // by commy2
#include "\z\ace\addons\common\script_component.hpp" #include "script_component.hpp"
_index = _this select 0; _index = _this select 0;