Merge remote-tracking branch 'origin/master' into bugfix/killers-respawn

ArmaForces · Feb 15, 2024 · 17fd9b8 · 17fd9b8
2 parents 2f7f8ec + 5bfe82a
commit 17fd9b8
Show file tree

Hide file tree

Showing 47 changed files with 15,354 additions and 139 deletions.
diff --git a/addons/civilian/XEH_PREP.hpp b/addons/civilian/XEH_PREP.hpp
@@ -3,7 +3,6 @@ PREP(civilianKilled);
 PREP(civilianKilledMarker);
 PREP(civilianKilledMsg);
 PREP(createCivilian);
-PREP(createVehicle);
 PREP(getCityByLocation);
 PREP(getCityName);
 PREP(getCityRandomPos);
@@ -12,6 +11,5 @@ PREP(getNearestVehicle);
 PREP(initCity);
 PREP(initCivilians);
 PREP(initCiviliansConfig);
-PREP(initVehicles);
 PREP(initCivilian);
 PREP(unassignCivilianFromCity);
diff --git a/addons/civilian/XEH_preInit.sqf b/addons/civilian/XEH_preInit.sqf
@@ -55,11 +55,6 @@ if (isServer) then {
         _x setVariable [QGVAR(CiviliansCount), _civiliansCount];
         _x setVariable [QGVAR(initialCiviliansCount), _civiliansCount];
     } forEach GVAR(cities);
-
-
-    // We need some improvements in determining civilian vehicles limit
-    GVAR(emptyVehiclesLimit) = GVAR(emptyVehiclesLimitMultiplier) * (5 * count (GVAR(cities)));
-    call FUNC(initVehicles);
 };
 
 ADDON = true;
diff --git a/addons/civilian/config.cpp b/addons/civilian/config.cpp
@@ -7,7 +7,8 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
-            "afsk_common"
+            "afsk_common",
+            "afsk_vehicles"
         };
         author = "ArmaForces";
         VERSION_CONFIG;

diff --git a/addons/civilian/functions/fnc_initCity.sqf b/addons/civilian/functions/fnc_initCity.sqf
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 /*
  * Author: 3Mydlo3
- * Function initializes given city with module, civilians and vehicles.
+ * Function initializes given city with module and civilians.
  *
  * Arguments:
  * 0: City to initialize <CONFIG/LOCATION>
@@ -43,5 +43,5 @@ _cityNamespace setVariable [QGVAR(CiviliansList), []];
 _cityNamespace setVariable [QGVAR(CiviliansCount), 0];
 _cityNamespace setVariable [QGVAR(initialCiviliansCount), 0];
 
-// Init vehicles
+// Return
 _cityNamespace
diff --git a/addons/civilian/initSettings.inc.sqf b/addons/civilian/initSettings.inc.sqf
@@ -6,14 +6,3 @@
     [0, 400, 200, 0],
     true
 ] call CBA_fnc_addSetting;
-
-[
-    QGVAR(emptyVehiclesLimitMultiplier),
-    "LIST",
-    [LSTRING(EmptyVehiclesLimit), LSTRING(EmptyVehiclesLimit_Description)],
-    [LSTRING(DisplayName), localize "str_dn_vehicles"],
-    [[1, 2, 3], [LSTRING(Low), LSTRING(Medium), LSTRING(High)], 1],
-    true,
-    {},
-    true
-] call CBA_fnc_addSetting;
diff --git a/addons/civilian/stringtable.xml b/addons/civilian/stringtable.xml
@@ -5,14 +5,6 @@
             <English>SerialKillers - Civilian</English>
             <Polish>SerialKillers - Cywile</Polish>
         </Key>
-        <Key ID="STR_AFSK_Civilian_EmptyVehiclesLimit">
-            <English>Civilian vehicles limit</English>
-            <Polish>Limit pojazdów cywilnych</Polish>
-        </Key>
-        <Key ID="STR_AFSK_Civilian_EmptyVehiclesLimit_Description">
-            <English>Controls how much civilian vehicles will be created on the whole map.</English>
-            <Polish>Ustala jak dużo pojazdów cywilnych będzie utworzonych na całej mapie.</Polish>
-        </Key>
         <Key ID="STR_AFSK_Civilian_Civilian_Killed_In_City">
             <English>Civilian was killed at %1 in %2!</English>
             <Polish>Cywil został zabity o godzinie %1 w %2!</Polish>

diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp
@@ -16,5 +16,4 @@ PREP(isHouseNearby);
 PREP(isRoadNearby);
 PREP(playMusicServer);
 PREP(removeItemsFromArsenal);
-PREP(setVehicleRandomTexture);
 PREP(showMessage);
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
@@ -10,9 +10,7 @@ if (isServer) then {
     }] call CBA_fnc_addEventHandler;
 };
 
-[QGVAR(showMessage), {
-    _this call FUNC(showMessage);
-}] call CBA_fnc_addEventHandler;
+[QGVAR(showMessage), FUNC(showMessage)] call CBA_fnc_addEventHandler;
 
 [QGVAR(teleport), {
     params ["_caller", "_destination"];