W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update _object_damage private array

Browse Source 
Vanilla commits:

21ea5984c9

a13e7240dc
This commit is contained in:
ebaydayz
2016-10-14 16:07:03 -04:00
parent 5e51787e59
commit 6cf740e7d4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/compile/keyboard.sqf
View File

@@ -252,6 +252,7 @@ if (isNil "keyboard_keys") then {
_handled = true; _handled = true;
r_interrupt = true; r_interrupt = true;
}; };
if (animationState player in ["bunnyhopunarmed","bunnyhoprifle"]) then { if (animationState player in ["bunnyhopunarmed","bunnyhoprifle"]) then {
//Fixes invisible weapon switch glitch if double tapping vault with no weapon in hands //Fixes invisible weapon switch glitch if double tapping vault with no weapon in hands
_handled = true; _handled = true;
@@ -275,6 +276,7 @@ if (isNil "keyboard_keys") then {
_block = { _block = {
_handled = true; _handled = true;
}; };
_addArray = { _addArray = {
{ {
keyboard_keys set [_x, _this select 1]; keyboard_keys set [_x, _this select 1];

5
SQF/dayz_server/compile/server_updateObject.sqf
View File

@@ -109,11 +109,12 @@ _object_inventory = {
_object_damage = { _object_damage = {
//Allow dmg process //Allow dmg process
private ["_hitpoints","_array","_hit","_selection","_key","_damage","_allFixed"]; private ["_hitpoints","_array","_hit","_selection","_key","_damage","_allFixed","_forced","_recorddmg"];
_hitpoints = _object call vehicle_getHitpoints; _hitpoints = _object call vehicle_getHitpoints;
_damage = damage _object; _damage = damage _object;
_array = []; _array = [];
_allFixed = true; _allFixed = true;
{ {
_hit = [_object,_x] call object_getHit; _hit = [_object,_x] call object_getHit;
_selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name"); _selection = getText (configFile >> "CfgVehicles" >> (typeOf _object) >> "HitPoints" >> _x >> "name");
@@ -127,6 +128,7 @@ _object_damage = {
} forEach _hitpoints; } forEach _hitpoints;
if (_allFixed) then {_object setDamage 0;}; if (_allFixed) then {_object setDamage 0;};
if (_forced) then { if (_forced) then {
if (_object in needUpdate_objects) then {needUpdate_objects = needUpdate_objects - [_object];}; if (_object in needUpdate_objects) then {needUpdate_objects = needUpdate_objects - [_object];};
_recorddmg = true; _recorddmg = true;
@@ -147,6 +149,7 @@ _object_damage = {
} else { } else {
_key = format["CHILD:306:%1:",_objectID] + str _array + ":" + str _damage + ":"; _key = format["CHILD:306:%1:",_objectID] + str _array + ":" + str _damage + ":";
}; };
diag_log ("HIVE: WRITE: "+ str(_key)); diag_log ("HIVE: WRITE: "+ str(_key));
_key call server_hiveWrite; _key call server_hiveWrite;
}; };