Skip to content

Commit

Permalink
Change + for pushback
Browse files Browse the repository at this point in the history
  • Loading branch information
Vdauphin committed Feb 22, 2016
1 parent c0dc3c0 commit 66d889a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 16 deletions.
10 changes: 2 additions & 8 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/common/getHouses.sqf
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
_pos = _this select 0;
_radius = _this select 1;
_buildings = nearestObjects [_pos, ["Building"], _radius];
_useful = [];
{
if (format["%1", _x buildingPos 2] != "[0,0,0]" && {damage _x == 0} && {isNil {_x getVariable "btc_house_taken"}}) then
{
_useful set [count _useful, _x];
};
} forEach _buildings;
_useful
_useful = _buildings select {(format["%1", _x buildingPos 2] != "[0,0,0]" && {damage _x == 0} && {isNil {_x getVariable "btc_house_taken"}})};
_useful
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ _color = "";_markers = [];
switch (true) do {case (side _x == west) : {_color = "ColorBlue"};case (side _x == east) : {_color = "ColorRed"};case (side _x == independent) : {_color = "ColorGreen"}; default {_color = "ColorWhite"};};
format ["%1", _x] setmarkerColorlocal _color;
format ["%1", _x] setMarkerSizeLocal [0.7, 0.7];
_markers = _markers + [_marker];
_markers pushBack _marker;
};
} foreach _units;
player sideChat format ["UNITS:%1 - GROUPS:%2", count allunits, count allgroups];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if (!isNil {_group getVariable "getWeapons"}) then {_type_db = 5;};

if (vehicle leader _group != leader _group) then {_type_db = 1;};

if (_type_db == 1) then
if (_type_db == 1) then
{
private ["_veh"];
_veh = vehicle leader _group;
Expand Down
2 changes: 1 addition & 1 deletion =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/fob/create.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ _name = ctrlText 777;

_name_to_check = ("FOB " + (toUpper(_name)));
_array_markers = [];
{private "_n";_n = toUpper(_x);_array_markers = _array_markers + [_n];} foreach allMapMarkers;
{private "_n";_n = toUpper(_x);_array_markers pushBack _n;} foreach allMapMarkers;

if (_array_markers find _name_to_check >= 0) exitWith {closeDialog 0;hint "Name already in use!";_mat spawn btc_fnc_fob_create;};

Expand Down
10 changes: 5 additions & 5 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/ied/fired_near.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ _pos = getPos _this;
_pos = [_pos select 0, _pos select 1, (_pos select 2) + 0.5];
_range = 2;

_bomb_check =
_bomb_check =
{
_ied = _this select 0;
_bomb = _this select 1;
Expand All @@ -13,21 +13,21 @@ _bomb_check =

_array = [];

while {alive _this && !isNull _this && _this getVariable ["active",false]} do
while {alive _this && !isNull _this && _this getVariable ["active",false]} do
{
_list = _pos nearObjects ["Default",_range];
if (count _list > 0) then
if (count _list > 0) then
{
{
private "_bullet";
_b = _x;
_bullet = typeOf _b;
if ({_bullet isKindOf _x} count ["SmokeShell", "FlareCore", "IRStrobeBase", "GrenadeHand_stone", "Smoke_120mm_AMOS_White", "TMR_R_DG32V_F"] > 0) exitWith {};
if ({_bullet isKindOf _x} count ["TimeBombCore","BombCore", "Grenade"] > 0) then
if ({_bullet isKindOf _x} count ["TimeBombCore","BombCore", "Grenade"] > 0) then
{
if !(_b in _array) then
{
_array = _array + [_b];
_array pushBack _b;
[_this,_b] spawn _bomb_check;
};
}
Expand Down

0 comments on commit 66d889a

Please sign in to comment.