0.3.9.0492

add missing create marker sqf
This commit is contained in:
vbawol 2016-06-04 14:04:55 -05:00
parent c068bc89e8
commit 9833a11737
33 changed files with 76 additions and 6 deletions

View File

@ -41,7 +41,7 @@
7 deleteMarker 7 deleteMarker
7 setMarker !="CBA_fnc_setMarkerPersistent\"" !="\\fnc_setMarkerPersistent" !="\"setMarkerPersistent" 7 setMarker !="CBA_fnc_setMarkerPersistent\"" !="\\fnc_setMarkerPersistent" !="\"setMarkerPersistent"
7 createMarker !="CBA_fnc_createMarker\"" !="\\fnc_createMarker" !="\"createMarker" !="cba_fCreateMarker" 7 createMarker !="CBA_fnc_createMarker\"" !="\\fnc_createMarker" !="\"createMarker" !="cba_fCreateMarker"
7 assignItem !="axeVIP assignItem _item;" 7 assignItem !="axeVIP assignItem _item;" !="unassignItem"
7 forceAddUniform 7 forceAddUniform
7 removeAllMPEventHandlers 7 removeAllMPEventHandlers
7 setDammage 7 setDammage
@ -71,6 +71,7 @@
7 loadFile 7 loadFile
7 selectPlayer !="selectPlayer _playerObject;" 7 selectPlayer !="selectPlayer _playerObject;"
7 setGroupIconsVisible 7 setGroupIconsVisible
7 setGroupIconsVisible
7 setGroupIconsSelectable 7 setGroupIconsSelectable
7 setGroupIconParams 7 setGroupIconParams
7 addGroupIcon 7 addGroupIcon

View File

@ -1 +1 @@
build=490; build=492;

View File

@ -1 +1 @@
build=490; build=492;

View File

@ -0,0 +1,69 @@
/*
Author: Andrew Gregory - EpochMod.com
Contributors:
Description:
Create map marker for everyone, group or individual.
ToDo:
Create delete marker(s) remoteexec function
Parameter(s):
_this select 0: ARRAY - [Target Type 0-Player 1-Group Members 2-Multiple players 3-All players, Object(s) - Player, Group, Array of Players or markerName for option 3]
_this select 1-9: STRING(S) - Marker parameters.
Licence:
Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
Github:
https://github.com/EpochModTeam/Epoch/tree/master/Sources/epoch_server/compile/epoch_server/EPOCH_server_createMarker.sqf
*/
params ["_trgt","_mPos",["_mShape","ICON"],["_mType","mil_dot"],["_mText",""],["_mColor","ColorBlack"],["_mSize",[0.7,0.7]],"_mBrush","_mDir","_mAlpha",["_mrkrName",""]];
private ["_trgtType","_trgtObj"];
diag_log format["Epoch: ADMIN: Creating marker at %1 called by %2.", _mPos, _trgt];
if(count _trgt < 2)exitWith{};
_trgtType = _trgt select 0;
_trgtObj = _trgt select 1;
if(_mrkrName == "")then{_mrkrName = str(_trgtObj) + str(diag_tickTime);};
switch _trgtType do {
case 0: {
if(isPlayer _trgtObj)then{
[_trgtObj,_mPos,_mShape,_mType,_mColor,_mSize,_mBrush,_mDir,_mText,_mAlpha,_mrkrName] remoteExec ['EPOCH_fnc_createMarker',_trgtObj];
};
};
case 1: {
if!(isNull _trgtObj)then{
{
[_x,_mPos,_mShape,_mType,_mColor,_mSize,_mBrush,_mDir,_mText,_mAlpha,_mrkrName] remoteExec ['EPOCH_fnc_createMarker',_x];
}foreach (units group _trgtObj);
};
};
case 2: {
if(isArray _trgtObj && count _trgtObj > 0)then{
{
[_x,_mPos,_mShape,_mType,_mColor,_mSize,_mBrush,_mDir,_mText,_mAlpha,_mrkrName] remoteExec ['EPOCH_fnc_createMarker',_x];
}foreach _trgtObj;
};
};
case 3: {
if(count playableUnits > 0)then{//TODO: Test JIP, if so remove check for players, maybe.
if(_trgtObj == "")then{_trgtObj=diag_tickTime;};
_mrkr = createMarker [_mrkrName, _mPos];
_mrkr setMarkerShape _mShape;
_mrkr setMarkerType _mType;
if!(_mText == "")then{_mrkr setMarkerText _mText;};
_mrkr setMarkerColor _mColor;
_mrkr setMarkerSize _mSize;
if!(isNil "_mBrush")then{_mrkr setMarkerBrush _mBrush;};
if!(isNil "_mDir")then{_mrkr setMarkerDir _mDir;};
if!(isNil "_mAlpha")then{_mrkr setMarkerAlpha _mAlpha;};
};
};
default {diag_log format["Epoch: ADMIN: Marker failed at %1 called by %2.", _mPos, _trgt];};
};

Binary file not shown.

View File

@ -1 +1 @@
build=490; build=492;

View File

@ -1 +1 @@
build=490; build=492;

View File

@ -1 +1 @@
490 492