W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix vector objects loading in with angle compensation

Browse Source 
With the code removed from line 266-271 the server would reset the slope
of the placed object to match the slope of the ground. Do not re-add the
code unless configs are updated with corresponding canbevertical option.
This commit is contained in:
icomrade
2016-05-15 18:36:05 -04:00
parent e2a14de977
commit eda3e1c202
1 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -77,10 +77,10 @@ if (_status == "ObjectStreamStart") then {
_pos = getMarkerpos "respawn_west"; _pos = getMarkerpos "respawn_west";
_wsDone = false; _wsDone = false;
if (count _worldspace >= 1 && {(typeName (_worldspace select 0)) == "SCALAR"}) then { if (count _worldspace >= 1 && {(typeName (_worldspace select 0)) == "SCALAR"}) then {
_dir = _worldspace select 0; _dir = _worldspace select 0;
}; };
if (count _worldspace == 2 && {(typeName (_worldspace select 1)) == "ARRAY"}) then { if (count _worldspace >= 2 && {(typeName (_worldspace select 1)) == "ARRAY"}) then {
_i = _worldspace select 1; _i = _worldspace select 1;
if (count _i == 3 && if (count _i == 3 &&
{(typeName (_i select 0)) == "SCALAR"} && {(typeName (_i select 0)) == "SCALAR"} &&
@@ -99,43 +99,46 @@ if (_status == "ObjectStreamStart") then {
//Vector building //Vector building
_vector = [[0,0,0],[0,0,0]]; _vector = [[0,0,0],[0,0,0]];
_vecExists = false; _vecExists = false;
_ownerPUID = "0"; _ownerPUID = "0";
if (count _worldspace >= 3) then{ _worldSpaceSize = count _worldspace;
if(count _worldspace == 3) then{ if (_worldSpaceSize >= 3) then{
if(typename (_worldspace select 2) == "STRING")then{ _ws2TN = typename (_worldspace select 2);
_ws3TN = typename (_worldspace select 3);
if (_worldSpaceSize == 3) then{
if (_ws2TN == "STRING") then{
_ownerPUID = _worldspace select 2; _ownerPUID = _worldspace select 2;
}else{ } else {
if(typename (_worldspace select 2) == "ARRAY")then{ if (_ws2TN == "ARRAY") then{
_vector = _worldspace select 2; _vector = _worldspace select 2;
if(count _vector == 2)then{ if (count _vector == 2) then{
if(((count (_vector select 0)) == 3) && ((count (_vector select 1)) == 3))then{ if (((count (_vector select 0)) == 3) && {(count (_vector select 1)) == 3}) then{
_vecExists = true; _vecExists = true;
}; };
}; };
}; };
}; };
}else{ } else {
//Was not 3 elements, so check if 4 or more //Was not 3 elements, so check if 4 or more
if(count _worldspace == 4) then{ if (_worldSpaceSize == 4) then{
if(typename (_worldspace select 3) == "STRING")then{ if (_ws3TN == "STRING") then{
_ownerPUID = _worldspace select 3; _ownerPUID = _worldspace select 3;
}else{ } else {
if(typename (_worldspace select 2) == "STRING")then{ if (_ws2TN == "STRING") then{
_ownerPUID = _worldspace select 2; _ownerPUID = _worldspace select 2;
}; };
}; };
if(typename (_worldspace select 2) == "ARRAY")then{ if (_ws2TN == "ARRAY") then{
_vector = _worldspace select 2; _vector = _worldspace select 2;
if(count _vector == 2)then{ if (count _vector == 2) then{
if(((count (_vector select 0)) == 3) && ((count (_vector select 1)) == 3))then{ if (((count (_vector select 0)) == 3) && {(count (_vector select 1)) == 3}) then{
_vecExists = true; _vecExists = true;
}; };
}; };
}else{ } else {
if(typename (_worldspace select 3) == "ARRAY")then{ if (_ws3TN == "ARRAY") then{
_vector = _worldspace select 3; _vector = _worldspace select 3;
if(count _vector == 2)then{ if (count _vector == 2) then{
if(((count (_vector select 0)) == 3) && ((count (_vector select 1)) == 3))then{ if (((count (_vector select 0)) == 3) && {(count (_vector select 1)) == 3}) then{
_vecExists = true; _vecExists = true;
}; };
}; };
@@ -143,14 +146,9 @@ if (_status == "ObjectStreamStart") then {
}; };
}; };
}; };
}; } else {
/* Plot For Life 2.5 */
// Realign characterID to OwnerPUID - need to force save though.
if (count _worldspace < 3) then {
_worldspace set [count _worldspace, "0"]; _worldspace set [count _worldspace, "0"];
}; };
_ownerPUID = _worldspace select 2;
if (_damage < 1) then { if (_damage < 1) then {
//diag_log format["OBJ: %1 - %2,%3,%4,%5,%6,%7,%8", _idKey,_type,_ownerID,_worldspace,_inventory,_hitPoints,_fuel,_damage]; //diag_log format["OBJ: %1 - %2,%3,%4,%5,%6,%7,%8", _idKey,_type,_ownerID,_worldspace,_inventory,_hitPoints,_fuel,_damage];
@@ -263,12 +261,7 @@ if (_status == "ObjectStreamStart") then {
if (_type in DayZ_nonCollide) then { if (_type in DayZ_nonCollide) then {
_pos set [2,0]; _pos set [2,0];
}; };
if (_pos select 2 == 0 or 0 == getNumber (configFile >> "CfgVehicles" >> _type >> "canbevertical")) then { [_object, _pos] call FNC_GetSetPos;
_object setVectorUp surfaceNormal _pos;
} else {
_object setVectorUp [0,0,1];
};
_object setPosATL _pos;
if ((_object isKindOf "DZ_buildables") or ((_type in DayZ_SafeObjects) && !(_object isKindOf "TrapItems"))) then { if ((_object isKindOf "DZ_buildables") or ((_type in DayZ_SafeObjects) && !(_object isKindOf "TrapItems"))) then {
_object setVariable["memDir",_dir,true]; _object setVariable["memDir",_dir,true];
if (DZE_GodModeBase && {!(_object in DZE_GodModeBaseExclude)}) then {_object addEventHandler ["HandleDamage",{false}];} else {_object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}];}; if (DZE_GodModeBase && {!(_object in DZE_GodModeBaseExclude)}) then {_object addEventHandler ["HandleDamage",{false}];} else {_object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}];};