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 vanilla player build

Browse Source 
Vanilla development commit:

20f992fcb7
This commit is contained in:
ebaydayz
2016-08-11 20:01:53 -04:00
parent d60600a825
commit b2394703f3
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_woodensplint.hpp
View File

@@ -5,7 +5,7 @@ class equip_woodensplint : CA_Magazine {
descriptionShort = $STR_ITEM_DESC_WOODENSPLINT; descriptionShort = $STR_ITEM_DESC_WOODENSPLINT;
model = "\z\addons\dayz_communityassets\models\woodensplint.p3d"; model = "\z\addons\dayz_communityassets\models\woodensplint.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_woodensplint_ca.paa"; picture = "\z\addons\dayz_communityassets\pictures\equip_woodensplint_ca.paa";
type = 256; type = 256; //WeaponSlotItem * 2 in vanilla
class ItemActions { class ItemActions {
class Use { class Use {
text = $STR_ACTIONS_BRACE_LEG; text = $STR_ACTIONS_BRACE_LEG;

12
SQF/dayz_code/actions/player_buildVanilla.sqf
View File

@@ -307,13 +307,11 @@ while {r_action_count != 0 and Dayz_constructionContext select 4} do {
_object setVectorUp [0,0,1]; _object setVectorUp [0,0,1];
}; };
_position = +(_tmp); _position = +(_tmp);
_object setPosATL _position; _object setPosATL _position;
// check now that ghost is not colliding
call _checkBuildingCollision;
diag_log format ["_objColliding: %1", _objColliding];
}; };
// check now that ghost is not colliding
call _checkBuildingCollision;
// try to dock a beam from current ghost to another beams nearby // try to dock a beam from current ghost to another beams nearby
call _checkBeam2Magnet; call _checkBeam2Magnet;
@@ -373,7 +371,7 @@ while {r_action_count != 0 and Dayz_constructionContext select 4} do {
}; };
}; };
}; };
uiSleep 0.01; uiSleep 0.03;
}; };
if (!_actionBuildHidden) then { // player can't build until all is fine if (!_actionBuildHidden) then { // player can't build until all is fine