Revert "kleinere Anpassungen (#653)"

This reverts commit 88a4bc6.
TacticalBaconDevs · Oct 26, 2021 · b505351 · b505351
1 parent dbe23da
commit b505351
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/addons/building/configs/CfgEden.hpp b/addons/building/configs/CfgEden.hpp
@@ -17,11 +17,11 @@ class Cfg3DEN
 
                 class Attributes
                 {
-                    class GVAR(resourcenCargo)
+                    class TBMod_Building_resourcenCargo
                     {
-                        displayName = "Resourcentruckladung";
+                        displayName = "Resourcentruck Ladung:";
                         tooltip = "Resourcen fürs Bauen von Gebäuden";
-                        property = QGVAR(resourcenCargo);
+                        property = "TBMod_Building_resourcenCargo";
                         control = "Edit";
 
                         expression = "_this setVariable ['%s', _value, true];";
@@ -34,11 +34,11 @@ class Cfg3DEN
                         typeName = "NUMBER";
                     };
 
-                    class GVAR(kranWagen)
+                    class TBMod_Building_kranWagen
                     {
                         displayName = "Kranwagen";
                         tooltip = "Für größere Bauwerke brauchst du Kranwagen zur Unterstützung!";
-                        property = QGVAR(kranWagen);
+                        property = "TBMod_Building_kranWagen";
                         control = "Checkbox";
 
                         expression = "_this setVariable ['%s', _value, true];";

diff --git a/addons/building/configs/CfgVehicles.hpp b/addons/building/configs/CfgVehicles.hpp
@@ -167,7 +167,6 @@ class CfgVehicles
                 {
                     displayName = "Räumen";
                     EXCEPTIONS;
-
                     condition = QUOTE([cursorObject] call FUNC(canClearPlaceables));
                     statement = QUOTE([cursorObject] call FUNC(clearPlaceables));
                 };
@@ -200,9 +199,9 @@ class CfgVehicles
                 class ResourceTruck_getLoad \
                 { \
                     displayName = "Verbleibende Resourcen"; \
-                    condition = QUOTE(alive _target && (_target getVariable [ARR_2(QQGVAR(resourcenCargo), -1)]) >= 0); \
+                    condition = "alive _target && (_target getVariable ['TBMod_Building_resourcenCargo', -1]) >= 0"; \
                     EXCEPTIONS; \
-                    statement = QUOTE(hint format ['Das Fahrzeug hat noch %1 Resourcen', (_target getVariable [ARR_2(QQGVAR(resourcenCargo), 0)]) max 0]); \
+                    statement = "hint format ['Das Fahrzeug hat noch %1 Resourcen', (_target getVariable ['TBMod_Building_resourcenCargo', 0]) max 0]"; \
                 }; \
                 class truck_getFuel \
                 { \

diff --git a/addons/building/configs/CfgWeapons.hpp b/addons/building/configs/CfgWeapons.hpp
@@ -53,7 +53,6 @@ class CfgWeapons
     ADD_ITEM(Land_Pallet_vertical_F,"\A3\structures_f\Civ\Constructions\Pallet_vertical_F.p3d",22);
     ADD_ITEM(Land_BagFence_Long_F,"A3\Structures_F\Mil\BagFence\BagFence_Long_F.p3d",44);
     ADD_ITEM(Land_BagFence_Round_F,"\A3\structures_f\mil\BagFence\BagFence_Round_F.p3d",40);
-
     class TB_building_item_ace_concertinawirecoil : TB_itemcore
     {
         scope = 2;
@@ -66,7 +65,6 @@ class CfgWeapons
             mass = 5;
         };
     };
-
     ADD_ITEM(Land_SandbagBarricade_01_hole_F,"\A3\Structures_F_Argo\Military\Fortifications\SandbagBarricade_01_hole_F.p3d",66);
 
 };
diff --git a/addons/building/configs/ExtendedEventHandlers.hpp b/addons/building/configs/ExtendedEventHandlers.hpp
@@ -24,7 +24,7 @@ class Extended_InitPost_EventHandlers
     {
         class ADDON // geht nicht -.-, kA warum, zu müde jetzt
         {
-            init = QUOTE([ARR_2('InitPost: %1', str _this)] call DEFUNC(main,debug); [ARR_2(_this select 0, 20000)] call TFAR_antennas_fnc_initRadioTower); // clientInit
+            init = QUOTE(['InitPost: %1', str _this] call EFUNC(main,debug); [_this select 0, 20000] call TFAR_antennas_fnc_initRadioTower); // clientInit
         };
     };
 };
@@ -33,6 +33,6 @@ class Extended_Deleted_EventHandlers
 {
     class TB_Land_TTowerSmall_1_F // geht nicht -.-, kA warum, zu müde jetzt
     {
-        ADDON = QUOTE([ARR_2('Delete: %1', str _this)] call DEFUNC(main,debug); (_this param [ARR_2(0, _this)]) call tfar_antennas_fnc_deleteRadioTower);
+        ADDON = QUOTE(['Delete: %1', str _this] call EFUNC(main,debug); (_this param [0,_this]) call tfar_antennas_fnc_deleteRadioTower);
     };
 };
diff --git a/addons/building/functions/fnc_initItemBig.sqf b/addons/building/functions/fnc_initItemBig.sqf
@@ -22,10 +22,10 @@ private _pickupAction = [
         params ["_target", "_player", "_argumente"];
         _argumente params ["_building", "_resourcen"];
 
-        ((nearestObjects [ACE_player, [], 50]) select {(_x getVariable [QGVAR(resourcenCargo), -1]) >= 0}) params [["_truck", objNull]];
+        ((nearestObjects [ACE_player, [], 50]) select {(_x getVariable ["TBMod_Building_resourcenCargo", -1]) >= 0}) params [["_truck", objNull]];
         if (isNull _truck) exitWith {systemChat "Kein Resourcentruck in der Nähe"};
 
-        _truck setVariable [QGVAR(resourcenCargo), (_truck getVariable [QGVAR(resourcenCargo), 0]) + round (_resourcen / 2), true];
+        _truck setVariable ["TBMod_Building_resourcenCargo", (_truck getVariable ["TBMod_Building_resourcenCargo", 0]) + round (_resourcen / 2), true];
 
         deleteVehicle _target;
     },

diff --git a/addons/eden/XEH_preServerInit.sqf b/addons/eden/XEH_preServerInit.sqf
@@ -178,7 +178,6 @@
             _x setBehaviour "CARELESS";
             _x setCombatMode "BLUE";
             _x setUnitPos "DOWN";
-
             [_x, true] remoteExecCall ["setCaptive", _x];
             [_x, "PATH"] remoteExecCall ["disableAI", _x];
             [{[_this, "PATH"] remoteExecCall ["disableAI", _this]}, _x, 2] call CBA_fnc_waitAndExecute;

diff --git a/addons/main/functions/fnc_shortcuts.sqf b/addons/main/functions/fnc_shortcuts.sqf
@@ -8,7 +8,6 @@
     https://github.com/CBATeam/CBA_A3/blob/master/addons/keybinding/fnc_addKeybind.sqf
     https://community.bistudio.com/wiki/DIK_KeyCodes
 */
-
 [
     "TBMod",
     QEGVAR(key,hideGUI),
@@ -125,4 +124,3 @@ if !(getPlayerUID ACE_player in (call TB_lvl3)) exitWith {};
     {},
     [DIK_END, [false, false, true]] // ALT + ENDE
 ] call CBA_fnc_addKeybind;
-