trying to fix syntax errors

gruppe-adler · Aug 4, 2019 · 8fc297d · 8fc297d
1 parent 722b58a
commit 8fc297d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 31 deletions.
diff --git a/BC_buyables/factions/russiaTank.hpp b/BC_buyables/factions/russiaTank.hpp
@@ -3,7 +3,7 @@ class RussiaTank {
     side = "Opfor";
     loadout = "russia";
     mode = "destroy";
-    
+
 
     // needs to be in every faction
     class StartVehicle {
@@ -28,6 +28,7 @@ class RussiaTank {
             terminalVectorDirAndUp = "[[0,1,0.3],[0,0,0.7]]";
             antennaOffset = "[0,-3.2,-0.1]";
             code = "[(_this select 0)] call BC_buyables_fnc_configureOpforStartVehicle; (_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 12];";
+            canMoveDuringTransmission = "true";
         };
     };
 
@@ -76,7 +77,7 @@ class RussiaTank {
             vehicleInit = "[['gm_gc_oli',1], ['camoNet_01_unhide',0]]";
             crewHelmet = "gm_gc_army_headgear_crewhat_80_blk";
             antennaOffset = "[0,-3.2,-0.1]";
-            code = "[(_this select 0)] call BC_buyables_fnc_configureOpforStartVehicle; (_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 6];";
+            code = "(_this select 0) addWeaponCargoGlobal ['rhs_weap_rpg26', 6];";
         };
     };
 
@@ -100,4 +101,4 @@ class RussiaTank {
             vehicleInit = "[['olive', 1], ['driverViewHatch',0,'commanderViewHatch',0,'hatchCommander',1]]";
         };
     };
-};
+};
diff --git a/BC_setup/functions/client/fn_establishingShot.sqf b/BC_setup/functions/client/fn_establishingShot.sqf
@@ -17,7 +17,7 @@
         _this select 8 (Optional): BOOL - Fade in after completion (default: true)
 */
 
-if (!isNil "BIS_fnc_establishingShot_skip") exitWith { diag_log format ["skipping establishing shot completely for jip"]; };
+if (missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false]) exitWith { diag_log format ["skipping establishing shot completely for jip"]; };
 
 params [
    ["_tgt", objNull, [objNull, []]],
@@ -131,7 +131,7 @@ private _skipEH = ([] call BIS_fnc_displayMission) displayAddEventHandler [
 
                 playSound ['click', true];
 
-                BIS_fnc_establishingShot_skip = true;
+                missionNamespace setVariable ['BIS_fnc_establishingShot_skip', true];
             };
 
 
@@ -163,11 +163,11 @@ waitUntil {!(isNull (uiNamespace getVariable "RscEstablishingShot"))};
 
 
 // Wait for the camera to load
-waitUntil {camPreloaded BIS_fnc_establishingShot_fakeUAV || !(isNil "BIS_fnc_establishingShot_skip")};
+waitUntil {camPreloaded BIS_fnc_establishingShot_fakeUAV || missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false]};
 
 private ["_drawEH"];
 
-if (isNil "BIS_fnc_establishingShot_skip") then {
+if (!missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false]) then {
     BIS_fnc_establishingShot_playing = true;
 
     // Create logic to play sounds
@@ -239,24 +239,24 @@ if (isNil "BIS_fnc_establishingShot_skip") then {
 
         // Static fade-in
         ("BIS_layerStatic" call BIS_fnc_rscLayer) cutRsc ["RscStatic", "PLAIN"];
-        waitUntil {!(isNull (uiNamespace getVariable "RscStatic_display")) || !(isNil "BIS_fnc_establishingShot_skip")};
-        waitUntil {isNull (uiNamespace getVariable "RscStatic_display")  || !(isNil "BIS_fnc_establishingShot_skip")};
+        waitUntil {!(isNull (uiNamespace getVariable "RscStatic_display")) || missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false])};
+        waitUntil {isNull (uiNamespace getVariable "RscStatic_display")  || missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false])};
 
-        if (isNil "BIS_fnc_establishingShot_skip") then {
+        if (!missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false]) then {
             // Show interlacing
             ("BIS_layerInterlacing" call BIS_fnc_rscLayer) cutRsc ["RscInterlacing", "PLAIN"];
 
-            
+
             titleCut ["", "PLAIN"];
-           
+
 
             // Add interlacing to optionsMenuClosed
-            optionsMenuClosed = 
+            optionsMenuClosed =
                 {
                     ("BIS_layerEstShot" call BIS_fnc_rscLayer) cutRsc ["RscEstablishingShot", "PLAIN"];
                     ("BIS_layerInterlacing" call BIS_fnc_rscLayer) cutRsc ["RscInterlacing", "PLAIN"];
                 };
-            
+
 
             // Show icons
             if (count BIS_fnc_establishingShot_icons > 0) then {
@@ -302,7 +302,7 @@ if (isNil "BIS_fnc_establishingShot_skip") then {
                 ];
             };
 
-            
+
             // Spawn instructions separately to allow for no delay in skipping
             _key spawn {
                 scriptName "BIS_fnc_establishingShot: instructions control";
@@ -312,7 +312,7 @@ if (isNil "BIS_fnc_establishingShot_skip") then {
                 private ["_key"];
                 _key = _this;
 
-                if (!(isKeyActive _key) && isNil "BIS_fnc_establishingShot_skip") then {
+                if (!(isKeyActive _key) && !missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false]) then {
                     // Display instructions
                     private ["_layerTitlecard"];
                     _layerTitlecard = "BIS_layerTitlecard" call BIS_fnc_rscLayer;
@@ -364,7 +364,7 @@ if (isNil "BIS_fnc_establishingShot_skip") then {
 
             private ["_time"];
             _time = time + 2;
-            waitUntil {time >= _time || !(isNil "BIS_fnc_establishingShot_skip")};
+            waitUntil {time >= _time || missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false]};
 
             if (isNil "BIS_fnc_establishingShot_skip") then {
 
@@ -377,13 +377,13 @@ if (isNil "BIS_fnc_establishingShot_skip") then {
 
                 private ["_time"];
                 _time = time + 999999;
-                waitUntil {time >= _time || !(isNil "BIS_fnc_establishingShot_skip") || (BLUFOR_TELEPORT_TARGET select 0 != 0) || player getVariable ["BC_choosingSpawn", false]};
+                waitUntil {time >= _time || missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false] || (BLUFOR_TELEPORT_TARGET select 0 != 0) || player getVariable ["BC_choosingSpawn", false]};
 
-                if (isNil "BIS_fnc_establishingShot_skip") then {
+                if (!missionNamespace getVariable ["BIS_fnc_establishingShot_skip", false]) then {
                     // Register the UAV finished
                     BIS_fnc_establishingShot_UAVDone = true;
                 };
-                
+
             };
         };
     };
@@ -447,7 +447,7 @@ if (player getVariable ["BC_choosingSpawn", false]) exitWith {
     // Clear existing global variables
     BIS_fnc_establishingShot_icons = nil;
     BIS_fnc_establishingShot_spaceEH = nil;
-    BIS_fnc_establishingShot_skip = nil;
+    missionNamespace setVariable ["BIS_fnc_establishingShot_skip", nil];
     BIS_fnc_establishingShot_UAVDone = nil;
 
     // Start mission

diff --git a/grad_tracking/functions/server/fn_radioTruckDeploy.sqf b/grad_tracking/functions/server/fn_radioTruckDeploy.sqf
@@ -13,10 +13,8 @@ if (typeOf _radiotruck == "rhs_gaz66_r142_vv") exitWith {
     _radiotruck setVariable ["GRAD_isAnimating", false, true];
 };
 
-/*
 _radiotruck setVariable ["GRAD_fuel", _fuel, true];
-[_radiotruck, 0] remoteExec ["setFuel", _owner];
-*/
+[_radiotruck, 0] remoteExecCall ["setFuel", _owner];
 
 sleep 3;
 _radiotruck setVariable ["GRAD_isDeployed", true, true];
@@ -32,8 +30,6 @@ if (count _antennaOffset > 0) then {
 };
 */
 
-/*
 if (_canMove) then {
-	[_radiotruck, _fuel] remoteExec ["setFuel", _owner];
+	[_radiotruck, _fuel] remoteExecCall ["setFuel", _owner];
 };
-*/
diff --git a/grad_tracking/functions/server/fn_radioTruckRetract.sqf b/grad_tracking/functions/server/fn_radioTruckRetract.sqf
@@ -15,10 +15,10 @@ sleep 3;
 _radiotruck setVariable ["GRAD_isDeployed", false, true];
 _radiotruck setVariable ["GRAD_isAnimating", false, true];
 
-/*
+
 _fuel = _radiotruck getVariable ["GRAD_fuel", 1];
-[_radiotruck, _fuel] remoteExec ["setFuel", owner _radiotruck];
-*/
+[_radiotruck, _fuel] remoteExecCall ["setFuel", owner _radiotruck];
+
 // [_radiotruck, true] remoteExec ["engineOn", owner _radiotruck];
 
 /*
@@ -27,4 +27,4 @@ if (!isNull _antenna) then {
     detach _antenna;
     deleteVehicle _antenna;
 };
-*/
+*/