Arma3_Epoch/blckeagles-revisited-RC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44 from Ghostrider-DbD-/Version-6.58-Build-58

Browse Source 
bug-fixes
This commit is contained in:
Ghostrider-DbD- 2017-05-19 06:58:21 -04:00 committed by GitHub
commit 79a3852ae0
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MPMissions/epoch.Altis/debug/blckClient.sqf
View File

@ -119,25 +119,25 @@ if !(isServer) then
fn_handleMessage = {
//private["_event","_msg","_mission"];
diag_log format["blck_Message ====] Paremeters = _this = %1",_this];
//diag_log format["blck_Message ====] Paremeters = _this = %1",_this];
params["_event","_message",["_mission",""]];
diag_log format["blck_Message ====] Paremeters _event %1 _message %2 paramter #3 %3",_event,_message,_mission];
diag_log format["blck_Message ====] _message isEqualTo %1",_message];
//diag_log format["blck_Message ====] Paremeters _event %1 _message %2 paramter #3 %3",_event,_message,_mission];
//diag_log format["blck_Message ====] _message isEqualTo %1",_message];
switch (_event) do
{
case "start":
{
playSound "UAV_05";
diag_log "switch start";
//diag_log "switch start";
//_mission = _this select 1 select 2;
[_event,_message,_mission] spawn fn_missionNotification;
};
case "end":
{
playSound "UAV_03";
diag_log "switch end";
//diag_log "switch end";
//_mission = _this select 1 select 2;
[_event,_message,_mission] spawn fn_missionNotification;
};
@ -153,7 +153,7 @@ if !(isServer) then
case "reinforcements":
{
if ( (player distance _mission) < 1000) then {playsound "AddItemOK"; ["Alert",_message] call fn_dynamicNotification;};
diag_log "---->>>> Reinforcements Spotted";
//diag_log "---->>>> Reinforcements Spotted";
};
case "IED":
{
@ -171,7 +171,7 @@ if !(isServer) then
};
diag_log "blck client loaded ver 1/11/17 2.0 8 PM";
diag_log "[blckeagls] starting client loop";
//diag_log "[blckeagls] starting client loop";
while {true} do
{

14
MPMissions/epoch.Altis/debug/spawnMarker.sqf
View File

@ -64,7 +64,7 @@ _blck_fn_configureRoundMarker = {
_blck_fn_configureIconMarker = {
private["_MainMarker"];
params["_name","_pos",["_color","ColorBlack"],["_text",""],["_icon","mil_triangle"]];
if (blck_debugLevel > 2) then {diag_log format["_blck_fn_configureIconMarker: _name=%1; _pos=%2; _color=%3; _text=%4",_name,_pos,_color,_text];};
//diag_log format["_blck_fn_configureIconMarker: _name=%1; _pos=%2; _color=%3; _text=%4",_name,_pos,_color,_text];
_name = "label" + _name;
_MainMarker = createMarker [_name, _pos];
@ -74,15 +74,19 @@ _blck_fn_configureIconMarker = {
_MainMarker setMarkerText _text;
};
if (isServer && (blck_debugLevel isEqualTo 3)) then
{
diag_log format["spawnMarker:: -- >> _this = %1",_this];
};
// _this = [[""BlueMarker"",[12524.1,18204.7,0],""Bandit Patrol"",""center"",""ColorBlue"",[""ELIPSE"",[175,175]]],""ColorBlue"",""BlueMarker""]"
params["_mArray"];
_mArray params["_missionType","_markerPos","_markerLabel","_markerLabelType","_markerColor","_markerType"];
_markerType params["_mShape","_mSize","_mBrush"];
//if (isServer && (blck_debugLevel > 0)) then
//{
if (blck_debugLevel > 1) then {diag_log format["spawnMarker.sqf:: -- >> _missionType %1 | _markerPos %2 | _markerLabel %3 | _markerLabelType %4 | _markerColor %5 | _markerType %6",_missionType,_markerPos,_markerLabel,_markerLabelType,_markerColor,_markerType];};
//};
if (isServer && (blck_debugLevel isEqualTo 3)) then
{
diag_log format["spawnMarker.sqf:: -- >> _missionType %1 | _markerPos %2 | _markerLabel %3 | _markerLabelType %4 | _markerColor %5 | _markerType %6",_missionType,_markerPos,_markerLabel,_markerLabelType,_markerColor,_markerType];
};
if ((_markerType select 0) in ["ELIPSE","RECTANGLE"]) then // not an Icon ....
{
switch (_missionType) do {