Merge remote-tracking branch 'origin/fixes-1'

fparma · Nov 6, 2017 · 3e156d8 · 3e156d8
2 parents 971f884 + 3b28dde
commit 3e156d8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/FP_Template.VR/config_mission.hpp b/FP_Template.VR/config_mission.hpp
@@ -15,9 +15,6 @@
 // The amount of lives players have
 // -1 means infinite respawn, 0 means players go into spectator on first death. can be higher
 #define CFG_JRM_RESPAWNS -1
-// The amount of time players spend in spectator between deaths, in seconds
-// -1 means disabled, no spectator unless no respawns. recommended minimum 20 seconds.
-#define CFG_JRM_SPECTATE_TIMER -1
 
 /*
 * ACE settings

diff --git a/FP_Template.VR/fparma/Params.hpp b/FP_Template.VR/fparma/Params.hpp
@@ -9,6 +9,14 @@ class ace_medical_level {
     default = 1;
 };
 
+class ace_zeus_autoAddObjects {
+    title = "Auto add zeus objects";
+    ACE_setting = 1;
+    values[] = {1};
+    texts[] =  {"Yes"};
+    default = 1;
+};
+
 class ace_medical_preventInstaDeath {
     title = "Prevent INSTANT death (e.g headshots - can still die when down)";
     ACE_setting = 1;

diff --git a/FP_Template.VR/mission.sqm b/FP_Template.VR/mission.sqm
@@ -547,7 +547,7 @@ class Mission
 			position[]={902.14502,5,986.20099};
 			class Attributes
 			{
-				condition="call{ace_player in thisList}";
+				condition="call{vehicle ace_player in thisList}";
 				onActivation="call{[true] call fpa_common_fnc_safeZone;}";
 				onDeactivation="call{[false] call fpa_common_fnc_safeZone;}";
 				sizeA=5;