Update compiles - 2 more files to do

fn_selfActions.sqf
player_updateGui.sqf
This commit is contained in:
icomrade
2016-02-29 00:26:12 -05:00
parent a83909b918
commit b96cd2d971
67 changed files with 3886 additions and 1212 deletions

View File

@@ -9,6 +9,18 @@ _altState = _this select 4;
_handled = false;
if (isNil "keyboard_keys") then {
_deadcheck = { // ESCAPE
// call player_forceSave;
// _idd = uiNamespace getVariable "RscDisplayMPInterrupt";
// if (isNil '_idd') then {
// createDialog 'RscDisplayMPInterrupt';
// }
// else {
// closeDialog 0;
// };
//keyboard_keys = nil;*/
_handled = false;
};
_cancelBuild = {
DZE_cancelBuilding = true;
call dayz_EjectPlayer;
@@ -33,15 +45,15 @@ if (isNil "keyboard_keys") then {
if (_ctrlState && !_altState) then {DZE_Z_ctrl = true;};
};
_rifle = {
["rifle"] spawn player_switchWeapon;
2 call dz_fn_switchWeapon;
_handled = true;
};
_pistol = {
["pistol"] spawn player_switchWeapon;
3 call dz_fn_switchWeapon;
_handled = true;
};
_melee = {
["melee"] spawn player_switchWeapon;
4 call dz_fn_switchWeapon;
_handled = true;
};
_throwable = { // select next non empty throwable weapon
@@ -155,9 +167,9 @@ if (isNil "keyboard_keys") then {
};
};
_drop = {
force_dropBody = true; //Prevent exploit of drag body
_doors = nearestObjects [player, DZE_DoorsLocked, 3]; //Prevent exploit of glitching through doors
if (count _doors > 0) then {_handled = true;};
force_dropBody = true;
};
_interrupt = {
r_interrupt = true;
@@ -171,12 +183,10 @@ if (isNil "keyboard_keys") then {
};
};
_journal = {
/*
if (!dayz_isSwimming and !dialog) then {
[player,4,true,(getPosATL player)] call player_alertZombies;
createDialog "horde_journal_front_cover";
};
*/
_handled = true;
};
@@ -236,7 +246,6 @@ if (isNil "keyboard_keys") then {
_handled = true; // used by keyboard.sqf
r_interrupt = true;
};
if (player isKindOf "PZombie_VB") then {
_handled = true;
DZE_PZATTACK = true;
@@ -283,6 +292,7 @@ if (isNil "keyboard_keys") then {
[actionKeys "User17", {DZE_4 = true;}] call _addArray;
[actionKeys "User18", {DZE_6 = true;}] call _addArray;
[actionKeys "User19", {DZE_5 = true;}] call _addArray;
//[[DIK_ESCAPE], _deadcheck] call _addArray;
[[DIK_1], _rifle] call _addArray;
[[DIK_2], _pistol] call _addArray;
[[DIK_3], _melee] call _addArray;
@@ -312,10 +322,16 @@ if (isNil "keyboard_keys") then {
// [[DIK_NUMPAD7], _rotate_left] call _addArray;
// [[DIK_NUMPAD9], _rotate_right] call _addArray;
[actionKeys "ForceCommandingMode", {DZE_5 = true;_handled = true;}] call _addArray;
[[ DIK_F9,DIK_F10,DIK_F11,DIK_F12,
[[ DIK_F9, DIK_F10, DIK_F11,
DIK_F8,DIK_F7,DIK_F6,DIK_F5,DIK_F4,
DIK_F3,DIK_F2,DIK_F1,DIK_0,DIK_9,
DIK_8,DIK_7,DIK_6,DIK_5,DIK_4], _block] call _addArray;
if (serverCommandAvailable "#kick") then {
[[DIK_F12], gcam_onoff] call _addArray; // GCAM: F12 to start (for admins only)
}
else {
[[DIK_F12], _block] call _addArray;
};
(findDisplay 46) displayRemoveAllEventHandlers "KeyUp";
(findDisplay 46) displayRemoveAllEventHandlers "KeyDown";
@@ -329,4 +345,8 @@ if (!isNil "_code") then {
call _code;
};
if (serverCommandAvailable "#kick") then {
GCam_KD = _this; // GCAM: GCam_KD is the current pressed key
};
_handled