bugfixes

Author: armazac

addons/overthrow_main/functions/actions/fn_salvageWreck.sqf

@@ -23,6 +23,7 @@ private _doSalvage = {
         "Vehicle is full, use a truck or ammobox for more storage" call OT_fnc_notifyMinor;
     };
 
+    closeDialog 0;
 	private _toname = (typeof _veh) call OT_fnc_vehicleGetName;
 	format["Salvaging wreck into %1",_toname] call OT_fnc_notifyMinor;
     player playMove "AinvPknlMstpSnonWnonDnon_medic_1";

addons/overthrow_main/functions/actions/fn_takeLegit.sqf

@@ -11,7 +11,7 @@ sleep 5;
 	_count = 0;
 	_cls = _x select 0;
 	_added = 0;
-	if(_cls in (OT_allItems - OT_consumableItems)) then {
+	if(_cls in OT_allItems) then {
 		while {_count < (_x select 1)} do {
 			if (player canAdd _cls) then {
 				player addItem _cls;

addons/overthrow_main/functions/actions/fn_transferLegit.sqf

@@ -44,7 +44,7 @@ _doTransfer = {
 				_cls = _d select 0;
 				_num = _d select 1;
 				if(_num > 0) then {
-					if(_cls in (OT_allItems - OT_consumableItems)) then {
+					if(_cls in OT_allItems) then {
 						while {_count < _num} do {
 							if !(_veh canAdd _cls) exitWith {_full = true;warehouse setVariable [_cls,_num - _count,true]};
 							_veh addItemCargoGlobal [_cls,1];

addons/overthrow_main/functions/fn_initOverthrow.sqf

@@ -43,17 +43,6 @@ OT_centerPos = getArray (configFile >> "CfgWorlds" >> worldName >> "centerPositi
 call compile preprocessFileLineNumbers "initVar.sqf";
 call OT_fnc_initVar;
 
-//Find markers
-OT_ferryDestinations = [];
-OT_NATO_control = [];
-OT_regions = [];
-{
-	if((_x select [0,12]) == "destination_") then {OT_ferryDestinations pushback _x};
-	if((_x select [0,8]) == "control_") then {OT_NATO_control pushback _x};
-	if((_x select [0,7]) == "island_") then {OT_regions pushback _x};
-	if((_x select [0,7]) == "region_") then {OT_regions pushback _x};
-}foreach(allMapMarkers);
-
 if(isServer) then {
     diag_log "Overthrow: Server Pre-Init";
 

addons/overthrow_main/functions/fn_initVar.sqf

@@ -932,6 +932,17 @@ OT_workshop = [
 
 OT_loadingMessages = ["Adding Hidden Agendas","Adjusting Bell Curves","Aesthesizing Industrial Areas","Aligning Covariance Matrices","Applying Feng Shui Shaders","Applying Theatre Soda Layer","Asserting Packed Exemplars","Attempting to Lock Back-Buffer","Binding Sapling Root System","Breeding Fauna","Building Data Trees","Bureacritizing Bureaucracies","Calculating Inverse Probability Matrices","Calculating Llama Expectoration Trajectory","Calibrating Blue Skies","Charging Ozone Layer","Coalescing Cloud Formations","Cohorting Exemplars","Collecting Meteor Particles","Compounding Inert Tessellations","Compressing Fish Files","Computing Optimal Bin Packing","Concatenating Sub-Contractors","Containing Existential Buffer","Debarking Ark Ramp","Debunching Unionized Commercial Services","Deciding What Message to Display Next","Decomposing Singular Values","Decrementing Tectonic Plates","Deleting Ferry Routes","Depixelating Inner Mountain Surface Back Faces","Depositing Slush Funds","Destabilizing Economic Indicators","Determining Width of Blast Fronts","Deunionizing Bulldozers","Dicing Models","Diluting Livestock Nutrition Variables","Downloading Satellite Terrain Data","Exposing Flash Variables to Streak System","Extracting Resources","Factoring Pay Scale","Fixing Election Outcome Matrix","Flood-Filling Ground Water","Flushing Pipe Network","Gathering Particle Sources","Generating Jobs","Gesticulating Mimes","Graphing Whale Migration","Hiding Willio Webnet Mask","Implementing Impeachment Routine","Increasing Accuracy of RCI Simulators","Increasing Magmafacation","Initializing Rhinoceros Breeding Timetable","Initializing Robotic Click-Path AI","Inserting Sublimated Messages","Integrating Curves","Integrating Illumination Form Factors","Integrating Population Graphs","Iterating Cellular Automata","Lecturing Errant Subsystems","Mixing Genetic Pool","Modeling Object Components","Mopping Occupant Leaks","Normalizing Power","Obfuscating Quigley Matrix","Overconstraining Dirty Industry Calculations","Partitioning City Grid Singularities","Perturbing Matrices","Pixellating Nude Patch","Polishing Water Highlights","Populating Lot Templates","Preparing Sprites for Random Walks","Prioritizing Landmarks","Projecting Law Enforcement Pastry Intake","Realigning Alternate Time Frames","Reconfiguring User Mental Processes","Relaxing Splines","Removing Road Network Speed Bumps","Removing Texture Gradients","Removing Vehicle Avoidance Behavior","Resolving GUID Conflict","Reticulating Splines","Retracting Phong Shader","Retrieving from Back Store","Reverse Engineering Image Consultant","Routing Neural Network Infanstructure","Scattering Rhino Food Sources","Scrubbing Terrain","Searching for Llamas","Seeding Architecture Simulation Parameters","Sequencing Particles","Setting Advisor ","Setting Inner Deity ","Setting Universal Physical Constants","Sonically Enhancing Occupant-Free Timber","Speculating Stock Market Indices","Splatting Transforms","Stratifying Ground Layers","Sub-Sampling Water Data","Synthesizing Gravity","Synthesizing Wavelets","Time-Compressing Simulator Clock","Unable to Reveal Current Activity","Weathering Buildings","Zeroing Crime Network"];
 
+//Find markers
+OT_ferryDestinations = [];
+OT_NATO_control = [];
+OT_regions = [];
+{
+	if((_x select [0,12]) == "destination_") then {OT_ferryDestinations pushback _x};
+	if((_x select [0,8]) == "control_") then {OT_NATO_control pushback _x};
+	if((_x select [0,7]) == "island_") then {OT_regions pushback _x};
+	if((_x select [0,7]) == "region_") then {OT_regions pushback _x};
+}foreach(allMapMarkers);
+
 if(isServer) then {
 	OT_varInitDone = true;
 	publicVariable "OT_varInitDone";

addons/overthrow_main/functions/virtualization/fn_runVirtualization.sqf

@@ -57,8 +57,6 @@ OT_townSpawners = [
 			params ["_spawntown","_spawnid"];
 			{
 				_hdl = [_spawntown,_spawnid] spawn _x;
-				waitUntil {sleep 0.2;scriptDone _hdl};
-				sleep 0.5;
 			}foreach(OT_townSpawners);
 	},[_town]] call OT_fnc_registerSpawner;
 }foreach(OT_allTowns);
@@ -81,14 +79,14 @@ while{true} do {
                 if !(_start call OT_fnc_inSpawnDistance) then {
                     if((time - _time) > 30) then { //Ensures it stays spawned for minimum 30 seconds
                         OT_allSpawned deleteAt _spawnidx;
-    					_x call OT_fnc_despawn;
+    					_x spawn OT_fnc_despawn;
     					sleep 0.1;
                     };
                 };
             }else{
                 if (_start call OT_fnc_inSpawnDistance) then {
                     OT_allSpawned pushback _id;
-					_x call OT_fnc_spawn;
+					_x spawn OT_fnc_spawn;
 					sleep 0.1;
                 };
             };
@@ -97,14 +95,14 @@ while{true} do {
                 if !((_start call OT_fnc_inSpawnDistance) || (_end call OT_fnc_inSpawnDistance)) then {
                     if((time - _time) > 30) then {
                         OT_allSpawned deleteAt _spawnidx;
-    					_x call OT_fnc_despawn;
+    					_x spawn OT_fnc_despawn;
     					sleep 0.1;
                     };
                 };
             }else{
                 if ((_start call OT_fnc_inSpawnDistance) || (_end call OT_fnc_inSpawnDistance)) then {
                     OT_allSpawned pushback _id;
-					_x call OT_fnc_spawn;
+					_x spawn OT_fnc_spawn;
 					sleep 0.1;
                 };
             };

addons/overthrow_main/functions/virtualization/spawners/fn_spawnNATOCheckpoint.sqf

@@ -16,6 +16,7 @@ private _vehtype = OT_vehTypes_civ call BIS_Fnc_selectRandom;
 
 private _roadscon = roadsConnectedto _road;
 private _dir = [_road, _roadscon select 0] call BIS_fnc_DirTo;
+if(isNil "_dir") then {_dir = 90};
 
 private _vehs = [_start,_dir,OT_tpl_checkpoint] call BIS_fnc_objectsMapper;