diff --git a/addons/apl/config.cpp b/addons/apl/config.cpp index 3a4743f1ac..bd97757a1c 100644 --- a/addons/apl/config.cpp +++ b/addons/apl/config.cpp @@ -6,8 +6,8 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_main"}; - author = "Bohemia Interactive"; - url = ECSTRING(main,URL); + author = "Bohemia Interactive"; + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; diff --git a/addons/common/functions/fnc_displayTextPicture.sqf b/addons/common/functions/fnc_displayTextPicture.sqf index 9ddbf96164..b0c42824be 100644 --- a/addons/common/functions/fnc_displayTextPicture.sqf +++ b/addons/common/functions/fnc_displayTextPicture.sqf @@ -44,6 +44,6 @@ if (typeName _text != "TEXT") then { _text = parseText format ["%1", _text]; }; -_text = composeText [parseText format ["", _image, _imageColor call BIS_fnc_colorRGBtoHTML], lineBreak, _text]; +_text = composeText [parseText format ["", _image, _imageColor call BIS_fnc_colorRGBtoHTML], lineBreak, _text]; [_text, _size] call FUNC(displayTextStructured); diff --git a/addons/finger/config.cpp b/addons/finger/config.cpp index 12e48da03e..fa953b4298 100644 --- a/addons/finger/config.cpp +++ b/addons/finger/config.cpp @@ -1,19 +1,19 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {QGVAR(moduleSettings)}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_common"}; - author = ECSTRING(common,ACETeam); - authors[] = {"Drill"}; - url = ECSTRING(main,URL); - VERSION_CONFIG; - }; -}; - - -#include "ACE_Settings.hpp" -#include "CfgEventHandlers.hpp" -#include "CfgVehicles.hpp" +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + units[] = {QGVAR(moduleSettings)}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_common"}; + author = ECSTRING(common,ACETeam); + authors[] = {"Drill"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; + + +#include "ACE_Settings.hpp" +#include "CfgEventHandlers.hpp" +#include "CfgVehicles.hpp" diff --git a/addons/frag/config.cpp b/addons/frag/config.cpp index 5526e5c1bc..1727570003 100644 --- a/addons/frag/config.cpp +++ b/addons/frag/config.cpp @@ -1,17 +1,17 @@ -#include "script_component.hpp" -class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_common"}; - author = ECSTRING(common,ACETeam); - authors[] = {"Nou"}; - url = ECSTRING(main,URL); - VERSION_CONFIG; - }; -}; - -#include "CfgEventhandlers.hpp" -#include "CfgAmmo.hpp" -#include "ACE_Settings.hpp" +#include "script_component.hpp" +class CfgPatches { + class ADDON { + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_common"}; + author = ECSTRING(common,ACETeam); + authors[] = {"Nou"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; + +#include "CfgEventhandlers.hpp" +#include "CfgAmmo.hpp" +#include "ACE_Settings.hpp" diff --git a/addons/optics/CfgWeapons.hpp b/addons/optics/CfgWeapons.hpp index 668ca815b5..75b0319b62 100644 --- a/addons/optics/CfgWeapons.hpp +++ b/addons/optics/CfgWeapons.hpp @@ -226,15 +226,15 @@ class CfgWeapons { class ItemInfo: ItemInfo { class OpticsModes: OpticsModes { - class Snip: Snip { - modelOptics[] = {QPATHTOF(models\ace_optics_reticle90.p3d),QPATHTOF(models\ace_optics_reticle90.p3d)}; + class Snip: Snip { + modelOptics[] = {QPATHTOF(models\ace_optics_reticle90.p3d),QPATHTOF(models\ace_optics_reticle90.p3d)}; useModelOptics = 1; opticsZoomInit = 0.0116; opticsZoomMax = 0.0464; opticsZoomMin = 0.0116; discreteFOV[] = {0.0464, 0.0116}; opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1","ACE_OpticsRadBlur1"}; - opticsDisablePeripherialVision = 0; + opticsDisablePeripherialVision = 0; }; class Iron: Iron {}; }; diff --git a/addons/overheating/CfgWeapons.hpp b/addons/overheating/CfgWeapons.hpp index d4e0844652..12cfe6e498 100644 --- a/addons/overheating/CfgWeapons.hpp +++ b/addons/overheating/CfgWeapons.hpp @@ -2,7 +2,7 @@ class CfgWeapons { class ACE_ItemCore; class InventoryItem_Base_F; - class ACE_SpareBarrel: ACE_ItemCore { + class ACE_SpareBarrel: ACE_ItemCore { displayname = CSTRING(SpareBarrelName); descriptionshort = CSTRING(SpareBarrelDescription); //model = ""; @@ -13,7 +13,7 @@ class CfgWeapons { }; }; - class RifleCore; + class RifleCore; class Rifle: RifleCore { //Mean Rounds Between Stoppages (this will be scaled based on the barrel temp) GVAR(mrbs) = 3000; diff --git a/addons/rangecard/config.cpp b/addons/rangecard/config.cpp index fd39a3a523..6e4a90c0ad 100644 --- a/addons/rangecard/config.cpp +++ b/addons/rangecard/config.cpp @@ -8,7 +8,7 @@ class CfgPatches { requiredAddons[] = {"ACE_Advanced_Ballistics"}; author = ECSTRING(common,ACETeam); authors[] = {"Ruthberg"}; - url = ECSTRING(main,URL); + url = ECSTRING(main,URL); VERSION_CONFIG; }; }; @@ -16,4 +16,4 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" -#include "RscTitles.hpp" +#include "RscTitles.hpp" diff --git a/addons/sandbag/CfgWeapons.hpp b/addons/sandbag/CfgWeapons.hpp index ce23c0924c..6a5fe29b79 100644 --- a/addons/sandbag/CfgWeapons.hpp +++ b/addons/sandbag/CfgWeapons.hpp @@ -7,10 +7,10 @@ class CfgWeapons { author = ECSTRING(common,ACETeam); scope = 2; displayName = CSTRING(sandbagEmpty_displayName); - model = QPATHTOF(data\ace_sandbag_m.p3d); + model = QPATHTOF(data\ace_sandbag_m.p3d); picture = QPATHTOF(data\m_sandbag_ca.paa); - - class ItemInfo: InventoryItem_Base_F { + + class ItemInfo: InventoryItem_Base_F { mass = 8; }; }; @@ -19,10 +19,10 @@ class CfgWeapons { author = ECSTRING(common,ACETeam); scope = 2; displayName = CSTRING(sandbag_displayName); - model = QPATHTOF(data\ace_sandbag_build.p3d); + model = QPATHTOF(data\ace_sandbag_build.p3d); picture = QPATHTOF(data\m_sandbag_ca.paa); - - class ItemInfo: InventoryItem_Base_F { + + class ItemInfo: InventoryItem_Base_F { mass = 160; }; }; diff --git a/addons/spottingscope/CfgWeapons.hpp b/addons/spottingscope/CfgWeapons.hpp index 9e190bab0d..acdf7c910f 100644 --- a/addons/spottingscope/CfgWeapons.hpp +++ b/addons/spottingscope/CfgWeapons.hpp @@ -7,10 +7,10 @@ class CfgWeapons { scope = 2; displayName = CSTRING(DisplayName); descriptionShort = ""; - picture = QPATHTOF(UI\w_spottingscope_ca.paa); + picture = QPATHTOF(UI\w_spottingscope_ca.paa); model = QPATHTOF(data\ace_spottingscope.p3d); - - class ItemInfo: InventoryItem_Base_F { + + class ItemInfo: InventoryItem_Base_F { mass = 40; }; }; diff --git a/addons/tagging/CfgVehicles.hpp b/addons/tagging/CfgVehicles.hpp index d384a2b01b..2a71c773a0 100644 --- a/addons/tagging/CfgVehicles.hpp +++ b/addons/tagging/CfgVehicles.hpp @@ -14,22 +14,22 @@ class CfgVehicles { class ACE_TagRed: ACE_TagBlack { displayName = CSTRING(TagRed); condition = QUOTE(('ACE_SpraypaintRed' in items ACE_player) && {[] call FUNC(checkTaggable)}); - statement = QUOTE([ARR_2(ACE_player,'red' call FUNC(getTexture))] call FUNC(tag)); - icon = QPATHTOF(UI\icons\iconTaggingRed.paa); - }; + statement = QUOTE([ARR_2(ACE_player,'red' call FUNC(getTexture))] call FUNC(tag)); + icon = QPATHTOF(UI\icons\iconTaggingRed.paa); + }; class ACE_TagGreen: ACE_TagBlack { displayName = CSTRING(TagGreen); condition = QUOTE(('ACE_SpraypaintGreen' in items ACE_player) && {[] call FUNC(checkTaggable)}); - statement = QUOTE([ARR_2(ACE_player,'green' call FUNC(getTexture))] call FUNC(tag)); - icon = QPATHTOF(UI\icons\iconTaggingGreen.paa); - }; + statement = QUOTE([ARR_2(ACE_player,'green' call FUNC(getTexture))] call FUNC(tag)); + icon = QPATHTOF(UI\icons\iconTaggingGreen.paa); + }; class ACE_TagBlue: ACE_TagBlack { displayName = CSTRING(TagBlue); condition = QUOTE(('ACE_SpraypaintBlue' in items ACE_player) && {[] call FUNC(checkTaggable)}); - statement = QUOTE([ARR_2(ACE_player,'blue' call FUNC(getTexture))] call FUNC(tag)); - icon = QPATHTOF(UI\icons\iconTaggingBlue.paa); + statement = QUOTE([ARR_2(ACE_player,'blue' call FUNC(getTexture))] call FUNC(tag)); + icon = QPATHTOF(UI\icons\iconTaggingBlue.paa); }; - }; + }; }; }; diff --git a/addons/tripod/CfgWeapons.hpp b/addons/tripod/CfgWeapons.hpp index c83336e7a0..3c5ca6d2b1 100644 --- a/addons/tripod/CfgWeapons.hpp +++ b/addons/tripod/CfgWeapons.hpp @@ -7,10 +7,10 @@ class CfgWeapons { scope = 2; displayName = CSTRING(DisplayName); descriptionShort = ""; - model = QPATHTOF(data\w_sniper_tripod.p3d); + model = QPATHTOF(data\w_sniper_tripod.p3d); picture = QPATHTOF(UI\w_sniper_tripod_ca.paa); - - class ItemInfo: InventoryItem_Base_F { + + class ItemInfo: InventoryItem_Base_F { mass = 40; }; }; diff --git a/addons/ui/ACE_UI.hpp b/addons/ui/ACE_UI.hpp index 008d97db9b..e59dd50385 100644 --- a/addons/ui/ACE_UI.hpp +++ b/addons/ui/ACE_UI.hpp @@ -1,180 +1,180 @@ -#define ANYWHERE 0 -#define GROUND_ONLY 1 -#define VEHICLE_ONLY 2 - +#define ANYWHERE 0 +#define GROUND_ONLY 1 +#define VEHICLE_ONLY 2 + class ACE_UI { class weaponName { idd = 300; elements[] = {118}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class weaponNameBackground { idd = 300; elements[] = {1001, 1008}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class firingMode { idd = 300; elements[] = {187, 1203}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class ammoType { idd = 300; elements[] = {155}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class ammoCount { idd = 300; elements[] = {184}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class magCount { idd = 300; elements[] = {185}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class throwableName { idd = 300; elements[] = {152}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class throwableCount { idd = 300; elements[] = {151}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class zeroing { idd = 300; elements[] = {168}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class weaponLowerInfoBackground { idd = 300; elements[] = {1202}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class staminaBar { idd = 305; elements[] = {193}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class stance { idd = 303; elements[] = {188, 1201}; - location = GROUND_ONLY; + location = GROUND_ONLY; class conditions {}; }; class gunnerWeaponName { idd = 300; elements[] = {118}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerWeaponNameBackground { idd = 300; elements[] = {1001, 1008}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerFiringMode { idd = 300; elements[] = {187, 1203}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerAmmoType { idd = 300; elements[] = {155}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerAmmoCount { idd = 300; elements[] = {184}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerMagCount { idd = 300; elements[] = {185}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerLaunchableName { idd = 300; elements[] = {152}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerLaunchableCount { idd = 300; elements[] = {151}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerZeroing { idd = 300; elements[] = {168}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class gunnerWeaponLowerInfoBackground { idd = 300; elements[] = {1202}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class vehicleName { idd = 300; elements[] = {120}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class vehicleNameBackground { idd = 300; elements[] = {1000, 1013}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class vehicleFuelBar { idd = 300; elements[] = {113, 1202}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class vehicleSpeed { idd = 300; elements[] = {121, 1004, 1006}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class vehicleAltitude { idd = 300; elements[] = {122, 1005, 1014}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class vehicleDamage { idd = 300; elements[] = {111}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; class vehicleInfoBackground { idd = 300; elements[] = {1200}; - location = VEHICLE_ONLY; + location = VEHICLE_ONLY; class conditions {}; }; };