W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove OEMPos variable

Browse Source 
I do not see any use for this variable any longer. Ive tested building, upgrading lock/unlock objects. It seems it has no affect and can be replaced with the normal getPosATL from objects.
This commit is contained in:
A Man
2022-03-26 14:53:12 +01:00
parent cf6ca366d3
commit fc6680c360
8 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/changeCode.sqf
View File

@@ -68,7 +68,7 @@ if (_isStorage) then {
sk_changeCode = [player,_cursorTarget,dayz_combination,dayz_authKey]; sk_changeCode = [player,_cursorTarget,dayz_combination,dayz_authKey];
publicVariableServer "sk_changeCode"; publicVariableServer "sk_changeCode";
} else { } else {
_location = _cursorTarget getVariable["OEMPos",getPosATL _cursorTarget]; _location = getPosATL _cursorTarget;
_dir = getDir _cursorTarget; _dir = getDir _cursorTarget;
_vector = [vectorDir _cursorTarget,vectorUp _cursorTarget]; _vector = [vectorDir _cursorTarget,vectorUp _cursorTarget];

1
SQF/dayz_code/actions/modular_build.sqf
View File

@@ -1418,7 +1418,6 @@ if (_canBuild) then {
call player_forceSave; call player_forceSave;
[format[localize "str_build_01", _text], 1] call dayz_rollingMessages; [format[localize "str_build_01", _text], 1] call dayz_rollingMessages;
_builtObject setVariable ["OEMPos", _position, true]; // store original location as a variable
if (_lockable > 1) then { //if item has code lock on it if (_lockable > 1) then { //if item has code lock on it

2
SQF/dayz_code/actions/player_buildingDowngrade.sqf
View File

@@ -84,7 +84,7 @@ if (count _upgrade > 0) then {
if (_i > 0) then { if (_i > 0) then {
local _position = _obj getVariable["OEMPos", getPosATL _obj]; local _position = getPosATL _obj;
local _dir = getDir _obj; local _dir = getDir _obj;
local _vector = [(vectorDir _obj), (vectorUp _obj)]; local _vector = [(vectorDir _obj), (vectorUp _obj)];

6
SQF/dayz_code/actions/player_upgrade.sqf
View File

@@ -138,11 +138,11 @@ if ((count _upgrade) > 0) then {
call player_forceSave; call player_forceSave;
local _location = _obj getVariable["OEMPos", (getPosATL _obj)]; local _location = getPosATL _obj;
local _dir = getDir _obj; local _dir = getDir _obj;
local _vector = [vectorDir _obj, vectorUp _obj]; local _vector = [vectorDir _obj, vectorUp _obj];
local _objectCharacterID = _obj getVariable ["CharacterID","0"]; local _objectCharacterID = _obj getVariable ["CharacterID","0"];
_classname = _newclassname; _classname = _newclassname;
local _object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"]; local _object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"];
//_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp //_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp

3
SQF/dayz_server/compile/server_changeCode.sqf
View File

@@ -15,7 +15,7 @@ _typeOf = typeOf _object;
if !(_typeOf in DZE_unlockedStorage) exitWith {diag_log "server_changeCode called with invalid storage object!"}; if !(_typeOf in DZE_unlockedStorage) exitWith {diag_log "server_changeCode called with invalid storage object!"};
_lockedClass = getText (configFile >> "CfgVehicles" >> _typeOf >> "lockedClass"); _lockedClass = getText (configFile >> "CfgVehicles" >> _typeOf >> "lockedClass");
_pos = _object getVariable ["OEMPos",getPosATL _object]; _pos = getPosATL _object;
_dir = getDir _object; _dir = getDir _object;
_vector = [vectorDir _object, vectorUp _object]; _vector = [vectorDir _object, vectorUp _object];
_charID = _object getVariable ["CharacterID","0"]; _charID = _object getVariable ["CharacterID","0"];
@@ -49,7 +49,6 @@ _holder setVariable ["memDir",_dir,true];
_holder setVectorDirAndUp _vector; _holder setVectorDirAndUp _vector;
_holder setPosATL _pos; _holder setPosATL _pos;
_holder setVariable ["CharacterID",_characterID,true]; _holder setVariable ["CharacterID",_characterID,true];
_holder setVariable ["OEMPos",_pos,true];
_ownerPUID = if (_charID == "0000" || _charID == "10000") then {_playerUID} else {_ownerID}; _ownerPUID = if (_charID == "0000" || _charID == "10000") then {_playerUID} else {_ownerID};
_worldSpace = [_dir,_pos,_ownerPUID,_vector]; _worldSpace = [_dir,_pos,_ownerPUID,_vector];

4
SQF/dayz_server/compile/server_handleSafeGear.sqf
View File

@@ -6,7 +6,7 @@ _status = _this select 2;
_name = ["Dead Player",name _player] select (alive _player); _name = ["Dead Player",name _player] select (alive _player);
_type = typeOf _obj; _type = typeOf _obj;
_pos = _obj getVariable ["OEMPos",getPosATL _obj]; _pos = getPosATL _obj;
_dir = direction _obj; _dir = direction _obj;
_vector = [vectorDir _obj, vectorUp _obj]; _vector = [vectorDir _obj, vectorUp _obj];
_charID = _obj getVariable ["CharacterID","0"]; _charID = _obj getVariable ["CharacterID","0"];
@@ -72,7 +72,6 @@ call {
_holder setVariable ["CharacterID",_charID,true]; _holder setVariable ["CharacterID",_charID,true];
_holder setVariable ["ObjectID",_objectID]; _holder setVariable ["ObjectID",_objectID];
_holder setVariable ["ObjectUID",_objectUID]; _holder setVariable ["ObjectUID",_objectUID];
_holder setVariable ["OEMPos",_pos,true];
_holder setDamage _damage; _holder setDamage _damage;
_holder setVariable ["ownerPUID",_ownerID,true]; _holder setVariable ["ownerPUID",_ownerID,true];
if (_isZSC && {_unlockedClass in DZE_MoneyStorageClasses}) then {_holder setVariable ["cashMoney",_coins,true];}; if (_isZSC && {_unlockedClass in DZE_MoneyStorageClasses}) then {_holder setVariable ["cashMoney",_coins,true];};
@@ -100,7 +99,6 @@ call {
_holder setVariable ["CharacterID",_charID,true]; _holder setVariable ["CharacterID",_charID,true];
_holder setVariable ["ObjectID",_objectID]; _holder setVariable ["ObjectID",_objectID];
_holder setVariable ["ObjectUID",_objectUID]; _holder setVariable ["ObjectUID",_objectUID];
_holder setVariable ["OEMPos",_pos,true];
_holder setDamage _damage; _holder setDamage _damage;
_holder setVariable ["ownerPUID",_ownerID,true]; _holder setVariable ["ownerPUID",_ownerID,true];
if (_isZSC && {_lockedClass in DZE_MoneyStorageClasses}) then {_holder setVariable ["cashMoney",_coins,true];}; if (_isZSC && {_lockedClass in DZE_MoneyStorageClasses}) then {_holder setVariable ["cashMoney",_coins,true];};

2
SQF/dayz_server/compile/server_swapObject.sqf
View File

@@ -69,8 +69,6 @@ if (!_allowed || !_proceed) exitWith {
// Publish variables // Publish variables
_object setVariable ["CharacterID",_charID,true]; _object setVariable ["CharacterID",_charID,true];
_object setVariable ["OEMPos",(_worldspace select 1),true];
//diag_log ("PUBLISH: Attempt " + str(_object)); //diag_log ("PUBLISH: Attempt " + str(_object));
//get UID //get UID

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

@@ -271,7 +271,6 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith {
} else { } else {
_object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}]; _object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}];
}; };
_object setVariable ["OEMPos",_pos,true]; // used for inplace upgrades and lock/unlock of safe
} else { } else {
_object enableSimulation true; _object enableSimulation true;
}; };