fix populateArea when grad-civs not initialized

gruppe-adler · Sep 8, 2017 · 30175ed · 30175ed
1 parent 688973f
commit 30175ed
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,8 @@ Add the class `cfgGradCivs` to your `description.ext`. Use the following attribu
 Attribute                | Default Value | Explanation
 -------------------------|---------------|------------------------------------------------------------------------------------------------------------------------------------------------
 autoInit                 | 1             | Toggles on automatic initialization of module on missions start (0/1). Turn this off if you want to use functions to set civs properties first.
+enableOnFoot             | 1             | Enable civilians on foot (0/1).
+enableInVehicles         | 1             | Enable civilians in vehicles (0/1).
 maxCivsOnFoot            | 30            | Maximum number of civs on foot.
 maxCivsInVehicles        | 10            | Maximum number of civs in vehicles.
 spawnDistancesOnFoot     | [1000,4500]   | Minimum and maximum distance to players that civilians on foot can spawn in.

diff --git a/functions/common/fn_populateArea.sqf b/functions/common/fn_populateArea.sqf
@@ -2,6 +2,7 @@
 
 if (!isServer) exitWith {};
 if (!canSuspend) exitWith {_this spawn grad_civs_fnc_populateArea};
+if (isNil "GRAD_CIVS_ONFOOTUNITS") exitWith {ERROR("grad-civs has not been initialized.")};
 
 params ["_area",["_amount",20]];
 

diff --git a/functions/spawn/fn_serverLoop.sqf b/functions/spawn/fn_serverLoop.sqf
@@ -1,6 +1,7 @@
 #include "..\..\component.hpp"
 
-if (!isServer) exitWith {};
+if (!isServer) exitWith {-1};
+if (!GRAD_CIVS_ENABLEDINVEHICLES && !GRAD_CIVS_ENABLEDONFOOT) exitWith {-1};
 
 private _mainLoop = {
     params ["_args", "_handle"];

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "grad-civs",
     "description": "ambient civilians",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "contributors": [
         {
             "name": "nomisum"