Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental

Browse Source
This commit is contained in:
DirtySanchez 2017-10-19 13:48:55 -05:00
commit cb2779777d
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf
View File

@ -142,6 +142,7 @@ if (vehicle player == player) then {
};
if (EPOCH_buildMode > 0) then {
if (!isnull EPOCH_Target) then {
if (!_ctrl) then {
_step = 0.5;
if(_shift)then{_step = 1.5;};
@ -168,6 +169,7 @@ if (vehicle player == player) then {
};
};
};
};
if (_dikCode in(actionKeys "moveFastForward") || _dikCode in(actionKeys "moveForward")) then {
if ((diag_tickTime - EPOCH_lastAGTime) > 1) then {

4
Sources/epoch_server/compile/epoch_server/EPOCH_server_traderKilled.sqf
View File

@ -17,8 +17,8 @@ private ["_markers","_objHiveKey","_slot","_playerCStats","_playerKarma","_playe
//[[[end]]]
params ["_trader","_player"];
if (!isNull _trader) then {
_markers = _trader getVariable["MARKER_REF",""];
if (_markers != []) then {
_markers = _trader getVariable["MARKER_REF",[]];
if !(_markers isequalto []) then {
{
_x setMarkerColor "ColorRed";
}forEach _markers;