From c89163316c4f07255eb0db243a0b9139988338e4 Mon Sep 17 00:00:00 2001 From: ir0n1e Date: Tue, 17 May 2016 11:21:48 +0200 Subject: [PATCH] fixed idention tabs are 4 spaces now --- addons/gunbag/CfgVehicles.hpp | 166 +++++++++--------- addons/gunbag/CfgWeapons.hpp | 58 +++--- addons/gunbag/config.cpp | 16 +- addons/gunbag/functions/fnc_calculateMass.sqf | 4 +- addons/gunbag/functions/fnc_canInteract.sqf | 4 +- addons/gunbag/functions/fnc_status.sqf | 8 +- addons/gunbag/functions/fnc_toGunbag.sqf | 4 +- addons/gunbag/stringtable.xml | 52 +++--- 8 files changed, 156 insertions(+), 156 deletions(-) diff --git a/addons/gunbag/CfgVehicles.hpp b/addons/gunbag/CfgVehicles.hpp index 29c2adcece..ceb81e6ab2 100644 --- a/addons/gunbag/CfgVehicles.hpp +++ b/addons/gunbag/CfgVehicles.hpp @@ -1,91 +1,91 @@ class CfgVehicles { - class Man; - class CAManBase: Man { - class ACE_Actions { - class ACE_MainActions { - class GVAR(WeapontoGunbag) { - displayName = CSTRING(toGunbag); - condition = QUOTE([ARR_2(_player,_target)] call FUNC(canInteract) == 0); - statement = QUOTE([ARR_2(_player,_target)] call FUNC(toGunbag)); - showDisabled = 0; - priority = 1; - icon = PATHTOF(ui\gunbag_icon_ca.paa); + class Man; + class CAManBase: Man { + class ACE_Actions { + class ACE_MainActions { + class GVAR(WeapontoGunbag) { + displayName = CSTRING(toGunbag); + condition = QUOTE([ARR_2(_player,_target)] call FUNC(canInteract) == 0); + statement = QUOTE([ARR_2(_player,_target)] call FUNC(toGunbag)); + showDisabled = 0; + priority = 1; + icon = PATHTOF(ui\gunbag_icon_ca.paa); + }; + class GVAR(WeaponoffGunbag) { + displayName = CSTRING(offGunbag); + condition = QUOTE([ARR_2(_player,_target)] call FUNC(canInteract) == 1); + statement = QUOTE([ARR_2(_player,_target)] call FUNC(offGunbag)); + showDisabled = 0; + priority = 1; + icon = PATHTOF(ui\gunbag_icon_ca.paa); + }; + class GVAR(StatusGunbag) { + displayName = CSTRING(Status); + condition = QUOTE([_target] call FUNC(isGunbag)); + statement = QUOTE([_target] call FUNC(status)); + showDisabled = 0; + priority = 2; + icon = PATHTOF(ui\gunbag_icon_ca.paa); + }; + }; }; - class GVAR(WeaponoffGunbag) { - displayName = CSTRING(offGunbag); - condition = QUOTE([ARR_2(_player,_target)] call FUNC(canInteract) == 1); - statement = QUOTE([ARR_2(_player,_target)] call FUNC(offGunbag)); - showDisabled = 0; - priority = 1; - icon = PATHTOF(ui\gunbag_icon_ca.paa); + + class ACE_SelfActions { + class ACE_Equipment { + class GVAR(actions) { + displayName = CSTRING(displayname); + condition = QUOTE([_player] call FUNC(isGunbag)); + showDisabled = 0; + priority = 0.1; + icon = PATHTOF(ui\gunbag_icon_ca.paa); + + class GVAR(WeapontoGunbag) { + displayName = CSTRING(toGunbag); + condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 0); + statement = QUOTE([ARR_2(_player,_player)] call FUNC(toGunbag)); + showDisabled = 0; + priority = 1; + icon = PATHTOF(ui\gunbag_icon_ca.paa); + }; + class GVAR(WeaponoffGunbag) { + displayName = CSTRING(offGunbag); + condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 1); + statement = QUOTE([ARR_2(_player,_player)] call FUNC(offGunbag)); + showDisabled = 0; + priority = 1; + icon = PATHTOF(ui\gunbag_icon_ca.paa); + }; + class GVAR(StatusGunbag) { + displayName = CSTRING(Status); + condition = QUOTE([_player] call FUNC(isGunbag)); + statement = QUOTE([_player] call FUNC(status)); + showDisabled = 0; + priority = 2; + icon = PATHTOF(ui\gunbag_icon_ca.paa); + }; + }; + }; }; - class GVAR(StatusGunbag) { - displayName = CSTRING(Status); - condition = QUOTE([_target] call FUNC(isGunbag)); - statement = QUOTE([_target] call FUNC(status)); - showDisabled = 0; - priority = 2; - icon = PATHTOF(ui\gunbag_icon_ca.paa); - }; - }; }; - class ACE_SelfActions { - class ACE_Equipment { - class GVAR(actions) { - displayName = CSTRING(displayname); - condition = QUOTE([_player] call FUNC(isGunbag)); - showDisabled = 0; - priority = 0.1; - icon = PATHTOF(ui\gunbag_icon_ca.paa); - - class GVAR(WeapontoGunbag) { - displayName = CSTRING(toGunbag); - condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 0); - statement = QUOTE([ARR_2(_player,_player)] call FUNC(toGunbag)); - showDisabled = 0; - priority = 1; - icon = PATHTOF(ui\gunbag_icon_ca.paa); - }; - class GVAR(WeaponoffGunbag) { - displayName = CSTRING(offGunbag); - condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 1); - statement = QUOTE([ARR_2(_player,_player)] call FUNC(offGunbag)); - showDisabled = 0; - priority = 1; - icon = PATHTOF(ui\gunbag_icon_ca.paa); - }; - class GVAR(StatusGunbag) { - displayName = CSTRING(Status); - condition = QUOTE([_player] call FUNC(isGunbag)); - statement = QUOTE([_player] call FUNC(status)); - showDisabled = 0; - priority = 2; - icon = PATHTOF(ui\gunbag_icon_ca.paa); - }; - }; - }; + class Bag_Base; + class CLASSNAME: Bag_Base { + _generalMacro = QUOTE(CLASSNAME); + author = "Ir0n1E"; + scope = 2; + displayName = CSTRING(Displayname); + model = PATHTOF(data\gunbag.p3d); + picture = PATHTOF(ui\gunbag_ca.paa); + icon = PATHTOF(ui\gunbag_icon_ca.paa); + hiddenSelections[] = {QUOTE(Camo),QUOTE(insignia)}; + hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_co.paa)}; + maximumLoad = 80; + mass = 11; }; - }; - class Bag_Base; - class CLASSNAME: Bag_Base { - _generalMacro = QUOTE(CLASSNAME); - author = "Ir0n1E"; - scope = 2; - displayName = CSTRING(Displayname); - model = PATHTOF(data\gunbag.p3d); - picture = PATHTOF(ui\gunbag_ca.paa); - icon = PATHTOF(ui\gunbag_icon_ca.paa); - hiddenSelections[] = {QUOTE(Camo),QUOTE(insignia)}; - hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_co.paa)}; - maximumLoad = 80; - mass = 11; - }; - - class DOUBLES(CLASSNAME,Tan): CLASSNAME { - displayName = CSTRING(Displayname_Tan); - picture = PATHTOF(ui\gunbag_tan_ca.paa); - hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_tan_co.paa)}; - }; + class DOUBLES(CLASSNAME,Tan): CLASSNAME { + displayName = CSTRING(Displayname_Tan); + picture = PATHTOF(ui\gunbag_tan_ca.paa); + hiddenSelectionsTextures[] = {PATHTOF(data\gunbag_tan_co.paa)}; + }; }; diff --git a/addons/gunbag/CfgWeapons.hpp b/addons/gunbag/CfgWeapons.hpp index b866962068..31ffb64c79 100644 --- a/addons/gunbag/CfgWeapons.hpp +++ b/addons/gunbag/CfgWeapons.hpp @@ -1,41 +1,41 @@ class CfgWeapons { - class Rifle_Long_Base_F; + class Rifle_Long_Base_F; - /* Long Rifles */ + /* Long Rifles */ - class GM6_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class GM6_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; - class LRR_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class LRR_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; - class DMR_06_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class DMR_06_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; - class DMR_05_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class DMR_05_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; - class DMR_04_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class DMR_04_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; - class DMR_03_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class DMR_03_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; - class DMR_02_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class DMR_02_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; - class DMR_01_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class DMR_01_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; - class EBR_base_F: Rifle_Long_Base_F { - GVAR(allowGunbag) = 1; - }; + class EBR_base_F: Rifle_Long_Base_F { + GVAR(allowGunbag) = 1; + }; }; diff --git a/addons/gunbag/config.cpp b/addons/gunbag/config.cpp index f6ce17ddc5..d0dcb40470 100644 --- a/addons/gunbag/config.cpp +++ b/addons/gunbag/config.cpp @@ -1,14 +1,14 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - units[] = {"ACE_Gunbag", "ACE_Gunbag_tan"}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_interaction", "ace_movement"}; - author[] = {"Ir0n1E"}; - VERSION_CONFIG; - }; + class ADDON { + units[] = {"ACE_Gunbag", "ACE_Gunbag_tan"}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_interaction", "ace_movement"}; + author[] = {"Ir0n1E"}; + VERSION_CONFIG; + }; }; #include "CfgEventHandlers.hpp" diff --git a/addons/gunbag/functions/fnc_calculateMass.sqf b/addons/gunbag/functions/fnc_calculateMass.sqf index 751d96d573..89ba84110c 100644 --- a/addons/gunbag/functions/fnc_calculateMass.sqf +++ b/addons/gunbag/functions/fnc_calculateMass.sqf @@ -19,7 +19,7 @@ params ["_weapon","_items"]; private _mass = getNumber (configFile >> "CfgWeapons" >> _weapon >> "WeaponSlotsInfo" >> "mass"); { - _mass = _mass + getNumber (configFile >> "CfgWeapons" >> _x >> "ItemInfo" >> "mass"); + _mass = _mass + getNumber (configFile >> "CfgWeapons" >> _x >> "ItemInfo" >> "mass"); } foreach _items; -(_mass / 22) +_mass diff --git a/addons/gunbag/functions/fnc_canInteract.sqf b/addons/gunbag/functions/fnc_canInteract.sqf index 85cc8373df..b4746a7f9d 100644 --- a/addons/gunbag/functions/fnc_canInteract.sqf +++ b/addons/gunbag/functions/fnc_canInteract.sqf @@ -22,11 +22,11 @@ _result = -1; _gunbag = backpackContainer _target; if(count (_gunbag getVariable [QGVAR(GunbagWeapon),[]]) <= 0 && {primaryWeapon _unit != ""} && {getNumber (configFile >> "CfgWeapons" >> primaryWeapon _unit >> QGVAR(allowGunbag)) == 1}) then { - _result = 0; + _result = 0; }; if(count (_gunbag getVariable [QGVAR(GunbagWeapon),[]]) >= 1 && {primaryWeapon _unit == ""}) then { - _result = 1; + _result = 1; }; _result diff --git a/addons/gunbag/functions/fnc_status.sqf b/addons/gunbag/functions/fnc_status.sqf index 5d4681c9fc..060c244462 100644 --- a/addons/gunbag/functions/fnc_status.sqf +++ b/addons/gunbag/functions/fnc_status.sqf @@ -18,9 +18,9 @@ params ["_unit"]; private _state = (backpackContainer _unit) getVariable [QGVAR(GunbagWeapon),[]]; if (count _state <= 0) then { - [localize LSTRING(empty)] call EFUNC(common,displayTextStructured); + [localize LSTRING(empty)] call EFUNC(common,displayTextStructured); } else { - private _weapon = (_state select 0) select 0; - [getText (configFile >> "CfgWeapons" >> _weapon >> "displayname"), - getText (configFile >> "CfgWeapons" >> _weapon >> "picture")] call EFUNC(common,displayTextPicture); + private _weapon = (_state select 0) select 0; + [getText (configFile >> "CfgWeapons" >> _weapon >> "displayname"), + getText (configFile >> "CfgWeapons" >> _weapon >> "picture")] call EFUNC(common,displayTextPicture); }; diff --git a/addons/gunbag/functions/fnc_toGunbag.sqf b/addons/gunbag/functions/fnc_toGunbag.sqf index cf6ea64a04..1451903da4 100644 --- a/addons/gunbag/functions/fnc_toGunbag.sqf +++ b/addons/gunbag/functions/fnc_toGunbag.sqf @@ -32,7 +32,7 @@ _items = [_state select 0, _state select 1, _state select 2, _state select 3]; if ((_magazine select 0) != "") then { - _unit addMagazine _magazine; + _unit addMagazine _magazine; }; _unit removeWeapon _weapon; @@ -41,5 +41,5 @@ _unit removeWeapon _weapon; _gunbag setVariable [QGVAR(GunbagWeapon), [[_weapon], _items], true]; if(["ACE_Backpacks"] call EFUNC(common,isModLoaded)) then { - [_unit, _target, backpackContainer _target] call EFUNC(backpacks,backpackOpened); + [_unit, _target, backpackContainer _target] call EFUNC(backpacks,backpackOpened); }; diff --git a/addons/gunbag/stringtable.xml b/addons/gunbag/stringtable.xml index 23198a0b86..83d995977a 100644 --- a/addons/gunbag/stringtable.xml +++ b/addons/gunbag/stringtable.xml @@ -1,29 +1,29 @@ - - - Gunbag - Waffentasche - - - Gunbag (Tan) - Waffentasche (Tan) - - - Put weapon into gunbag - Lege Waffe in Waffentasche - - - Get weapon out of gunbag - Hole Waffe aus Waffentasche - - - Status Gunbag - Status Waffentasche - - - Gunbag Empty - Waffentasche leer - - + + + Gunbag + Waffentasche + + + Gunbag (Tan) + Waffentasche (Tan) + + + Put weapon into gunbag + Lege Waffe in Waffentasche + + + Get weapon out of gunbag + Hole Waffe aus Waffentasche + + + Status Gunbag + Status Waffentasche + + + Gunbag Empty + Waffentasche leer + + \ No newline at end of file