Skip to content

Commit 027e8b4

Browse files
committed
Merge branch 'development-feature-unitspawner' into development
2 parents 35ac94b + d73de01 commit 027e8b4

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

source/dialog/request_squad.sqf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
_index = lbCurSel 2101;
22

3-
_spawnPos = getpos hq_blu1;
3+
//_spawnPos = getpos hq_blu1; blocked by Tuxu
4+
//center, minDist, maxDist, objDist, waterMode, maxGrad, shoreMode, blacklistPos, defaultPos
5+
//HQ, minDist=80,max =250, objdist = 20, landmode, maxgrad = 20, shoremode,
6+
_spawnPos = [getpos hq_blu1, 80, 250, 20, 0, 20, 0] call BIS_fnc_findSafePos;
47
_spawnPos = [(_spawnPos select 0)+15, _spawnPos select 1];
58

69
switch (_index) do
@@ -186,4 +189,4 @@ switch (_index) do
186189
};
187190
};
188191
};
189-
publicVariable "commandpointsblu1";
192+
publicVariable "commandpointsblu1";

source/dialog/request_vehicle.sqf

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
_index = lbCurSel 2102;
22

3-
4-
_spawnPos = getpos player;
5-
_spawnPos = [(_spawnPos select 0)+30, _spawnPos select 1];
3+
//findEmptyPosition example
4+
_spawnPos = (getpos hq_blu1) findEmptyPosition [20, 70]
5+
_spawnPos = [(_spawnPos select 0)+30, _spawnPos select 1]
66

77
addEWS_EH = {
88
(_this select 0) addEventHandler ["IncomingMissile", {
@@ -26,6 +26,10 @@ switch (_index) do {
2626
hint "Vehicle ready !";
2727
commandpointsblu1 = commandpointsblu1 - 4;
2828
ctrlSetText [1000, format["%1",commandpointsblu1]];
29+
//Might want refactor this next bit so it isn't repeated
30+
//In fact might want to refactor each case!
31+
_spawnPos = (getpos hq_blu1) findEmptyPosition [40, 120, vehicleType]
32+
_spawnPos = [(_spawnPos select 0)+30, _spawnPos select 1]
2933
vehic = "I_G_Offroad_01_F" createVehicle _spawnPos;
3034
} else {
3135
hint "Not enough command points";

0 commit comments

Comments
 (0)