From e4a7950d43d6df56c78b0cb788258b5c0973d3f2 Mon Sep 17 00:00:00 2001 From: Chris Cardozo Date: Sat, 3 Oct 2020 08:10:37 -0400 Subject: [PATCH] coding fixes --- .../GMS_fnc_spawnMissionVehiclePatrols.sqf | 16 +++++++++------- .../Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf index 7f8820b..decb967 100644 --- a/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf +++ b/@GMS/addons/custom_server/Compiles/Missions/GMS_fnc_spawnMissionVehiclePatrols.sqf @@ -22,22 +22,25 @@ if (_backpacks isEqualTo []) then {_backpacks = [_skillAI] call blck_fnc_sele if (_weaponList isEqualTo []) then {_weaponList = [_skillAI] call blck_fnc_selectAILoadout}; if (_sideArms isEqualTo []) then {[_skillAI] call blck_fnc_selectAISidearms}; -private["_vehGroup","_vehiclePatrolSpawns""_missiongroups","_vehiclePatrolSpawns","_vehicle","_spawnPos","_return"]; +private["_spawnPos","_return"]; private _vehicles = []; private _missionAI = []; private _abort = false; private _patrolsThisMission = +_missionPatrolVehicles; - +//diag_log format["_spawnMissionVehiclePatrols(30): _noVehiclePatrols = %1 | _patrolsThisMission = %2",_noVehiclePatrols,_patrolsThisMission]; if (_patrolsThisMission isEqualTo []) then { _useRelativePos = false; - _vehiclePatrolSpawns = [_coords,_noVehiclePatrols,45,60] call blck_fnc_findPositionsAlongARadius; + private _spawnLocations = [_coords,_noVehiclePatrols,45,60] call blck_fnc_findPositionsAlongARadius; + //diag_log format["_spawnMissionVehiclePatrols (35): _spawnLocations = %1",_spawnLocations]; { + private _v = [_skillAI] call blck_fnc_selectPatrolVehicle; _patrolsThisMission pushBack [_v, _x]; - }forEach _vehiclePatrolSpawns; + //diag_log format["_spawnMissionVehiclePatrols(36): _v = %1 | _patrolsThisMission = %2",_v,_patrolsThisMission]; + }forEach _spawnLocations; }; - +//diag_log format["_spawnMissionVehiclePatrols(42): _patrolsThisMission = %1",_patrolsThisMission]; #define configureWaypoints false { if (_useRelativePos) then @@ -47,9 +50,8 @@ if (_patrolsThisMission isEqualTo []) then _spawnPos = _x select 1; }; private _vehicle = _x select 0; - _vehGroup = [blck_AI_Side,true] call blck_fnc_createGroup; + private _vehGroup = [blck_AI_Side,true] call blck_fnc_createGroup; _patrolVehicle = objNull; - if !(isNull _vehGroup) then { _vehGroup setVariable["soldierType","vehicle"]; diff --git a/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf b/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf index a1c2f10..684a631 100644 --- a/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf +++ b/@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf @@ -12,8 +12,8 @@ */ #include "\q\addons\custom_server\Configs\blck_defines.hpp"; -params["_vehType","_pos",["_special","NONE"],["_radius",30]]; -//diag_log format["_spawnVehicle: _vehType = %1 | _special = %2 | _radiu = %3",_vehType,_special,_radius]; +params["_vehType",["_pos",[]],["_special","NONE"],["_radius",30]]; + private _veh = createVehicle[_vehType, _pos, [], _radius, _special]; _veh setVectorUp surfaceNormal position _veh; _veh allowDamage true;