Merge pull request #40 from TheMysteriousVincent/factions_interface_r…

…eloaded Factions interface reloaded
eisengrind · Apr 18, 2018 · 1453645 · 1453645
2 parents d38605b + 61dd4c3
commit 1453645
Show file tree

Hide file tree

Showing 109 changed files with 2,129 additions and 2,648 deletions.
diff --git a/@LiveInLifeClient/addons/LiveInLife - Verknüpfung.lnk b/@LiveInLifeClient/addons/LiveInLife - Verknüpfung.lnk
diff --git a/@LiveInLifeClient/addons/factions/functions/fn_add.sqf b/@LiveInLifeClient/addons/factions/functions/fn_add.sqf
@@ -1,28 +1,28 @@
 
 private _factionID = (player getVariable ["lilc_factionID", -1]);
-if (_factionID < 0) exitWith { false; }; 
-if (!alive player) exitWith { false; }; 
- 
+if (_factionID < 0) exitWith { false; };
+if (!alive player) exitWith { false; };
+
 private _factionInfo = ([_factionID] call lilc_factions_fnc_getFactionConfig);
-private _factionVar = (group player) getVariable ["lilc_factionID", -1]; 
-if (_factionVar == _factionID && _factionVar != -1) exitWith { true; }; 
- 
-private _faction = grpNull; 
+private _factionVar = (group player) getVariable ["lilc_factionID", -1];
+if (_factionVar == _factionID && _factionVar != -1) exitWith { true; };
+
+private _faction = grpNull;
 
 if (getNumber(_factionInfo >> "globalGroup") == 1) then
 {
     {
         private ["_currentID"];
         private _currentID = _x getVariable ["lilc_factionID", -1];
         if ((_factionID == _currentID) && (!isNull _x)) then
-        { 
-            _faction = _x; 
-        }; 
-    } forEach allGroups; 
-    
+        {
+            _faction = _x;
+        };
+    } forEach allGroups;
+
     if (isNull _faction) then
-    { 
-        _faction = createGroup civilian; 
+    {
+        _faction = createGroup civilian;
         _faction setVariable ["lilc_factionID", _factionID, true];
         _faction setVariable ["lilc_factionMainGroup", true, true];
     };
@@ -33,6 +33,6 @@ else
     _faction setVariable ["lilc_factionID", _factionID, true];
     _faction setVariable ["lilc_factionMainGroup", false, true];
 };
- 
+
 [player] joinSilent _faction;
-true;
+true;
diff --git a/@LiveInLifeClient/addons/factionsInterface/CfgFactionsInterfacePermissions.cpp b/@LiveInLifeClient/addons/factionsInterface/CfgFactionsInterfacePermissions.cpp
diff --git a/@LiveInLifeClient/addons/factionsInterface/CfgFunctions.cpp b/@LiveInLifeClient/addons/factionsInterface/CfgFunctions.cpp
diff --git a/@LiveInLifeClient/addons/factionsInterface/CfgPatches.cpp b/@LiveInLifeClient/addons/factionsInterface/CfgPatches.cpp
diff --git a/@LiveInLifeClient/addons/factionsInterface/XEH_preInitClient.sqf b/@LiveInLifeClient/addons/factionsInterface/XEH_preInitClient.sqf
diff --git a/@LiveInLifeClient/addons/factionsInterface/config.cpp b/@LiveInLifeClient/addons/factionsInterface/config.cpp