From fc6680c3600a9011bc62ed3f6b86c3a899ab38d3 Mon Sep 17 00:00:00 2001 From: A Man Date: Sat, 26 Mar 2022 14:53:12 +0100 Subject: [PATCH] Remove OEMPos variable 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. --- SQF/dayz_code/actions/changeCode.sqf | 2 +- SQF/dayz_code/actions/modular_build.sqf | 1 - SQF/dayz_code/actions/player_buildingDowngrade.sqf | 2 +- SQF/dayz_code/actions/player_upgrade.sqf | 6 +++--- SQF/dayz_server/compile/server_changeCode.sqf | 3 +-- SQF/dayz_server/compile/server_handleSafeGear.sqf | 4 +--- SQF/dayz_server/compile/server_swapObject.sqf | 2 -- SQF/dayz_server/system/server_monitor.sqf | 1 - 8 files changed, 7 insertions(+), 14 deletions(-) diff --git a/SQF/dayz_code/actions/changeCode.sqf b/SQF/dayz_code/actions/changeCode.sqf index 8af805b98..275353403 100644 --- a/SQF/dayz_code/actions/changeCode.sqf +++ b/SQF/dayz_code/actions/changeCode.sqf @@ -68,7 +68,7 @@ if (_isStorage) then { sk_changeCode = [player,_cursorTarget,dayz_combination,dayz_authKey]; publicVariableServer "sk_changeCode"; } else { - _location = _cursorTarget getVariable["OEMPos",getPosATL _cursorTarget]; + _location = getPosATL _cursorTarget; _dir = getDir _cursorTarget; _vector = [vectorDir _cursorTarget,vectorUp _cursorTarget]; diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf index 03e66c267..56b4775ce 100644 --- a/SQF/dayz_code/actions/modular_build.sqf +++ b/SQF/dayz_code/actions/modular_build.sqf @@ -1418,7 +1418,6 @@ if (_canBuild) then { call player_forceSave; [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 diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf index 3be475a50..330f7f498 100644 --- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf +++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf @@ -84,7 +84,7 @@ if (count _upgrade > 0) then { if (_i > 0) then { - local _position = _obj getVariable["OEMPos", getPosATL _obj]; + local _position = getPosATL _obj; local _dir = getDir _obj; local _vector = [(vectorDir _obj), (vectorUp _obj)]; diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf index 0fcf01507..2ec604297 100644 --- a/SQF/dayz_code/actions/player_upgrade.sqf +++ b/SQF/dayz_code/actions/player_upgrade.sqf @@ -138,11 +138,11 @@ if ((count _upgrade) > 0) then { call player_forceSave; - local _location = _obj getVariable["OEMPos", (getPosATL _obj)]; - local _dir = getDir _obj; + local _location = getPosATL _obj; + local _dir = getDir _obj; local _vector = [vectorDir _obj, vectorUp _obj]; local _objectCharacterID = _obj getVariable ["CharacterID","0"]; - _classname = _newclassname; + _classname = _newclassname; 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 diff --git a/SQF/dayz_server/compile/server_changeCode.sqf b/SQF/dayz_server/compile/server_changeCode.sqf index 62488129d..cd55ecfd0 100644 --- a/SQF/dayz_server/compile/server_changeCode.sqf +++ b/SQF/dayz_server/compile/server_changeCode.sqf @@ -15,7 +15,7 @@ _typeOf = typeOf _object; if !(_typeOf in DZE_unlockedStorage) exitWith {diag_log "server_changeCode called with invalid storage object!"}; _lockedClass = getText (configFile >> "CfgVehicles" >> _typeOf >> "lockedClass"); -_pos = _object getVariable ["OEMPos",getPosATL _object]; +_pos = getPosATL _object; _dir = getDir _object; _vector = [vectorDir _object, vectorUp _object]; _charID = _object getVariable ["CharacterID","0"]; @@ -49,7 +49,6 @@ _holder setVariable ["memDir",_dir,true]; _holder setVectorDirAndUp _vector; _holder setPosATL _pos; _holder setVariable ["CharacterID",_characterID,true]; -_holder setVariable ["OEMPos",_pos,true]; _ownerPUID = if (_charID == "0000" || _charID == "10000") then {_playerUID} else {_ownerID}; _worldSpace = [_dir,_pos,_ownerPUID,_vector]; diff --git a/SQF/dayz_server/compile/server_handleSafeGear.sqf b/SQF/dayz_server/compile/server_handleSafeGear.sqf index fc5e3c6f1..d4a5645cd 100644 --- a/SQF/dayz_server/compile/server_handleSafeGear.sqf +++ b/SQF/dayz_server/compile/server_handleSafeGear.sqf @@ -6,7 +6,7 @@ _status = _this select 2; _name = ["Dead Player",name _player] select (alive _player); _type = typeOf _obj; -_pos = _obj getVariable ["OEMPos",getPosATL _obj]; +_pos = getPosATL _obj; _dir = direction _obj; _vector = [vectorDir _obj, vectorUp _obj]; _charID = _obj getVariable ["CharacterID","0"]; @@ -72,7 +72,6 @@ call { _holder setVariable ["CharacterID",_charID,true]; _holder setVariable ["ObjectID",_objectID]; _holder setVariable ["ObjectUID",_objectUID]; - _holder setVariable ["OEMPos",_pos,true]; _holder setDamage _damage; _holder setVariable ["ownerPUID",_ownerID,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 ["ObjectID",_objectID]; _holder setVariable ["ObjectUID",_objectUID]; - _holder setVariable ["OEMPos",_pos,true]; _holder setDamage _damage; _holder setVariable ["ownerPUID",_ownerID,true]; if (_isZSC && {_lockedClass in DZE_MoneyStorageClasses}) then {_holder setVariable ["cashMoney",_coins,true];}; diff --git a/SQF/dayz_server/compile/server_swapObject.sqf b/SQF/dayz_server/compile/server_swapObject.sqf index 993c57c57..4aaf7d58c 100644 --- a/SQF/dayz_server/compile/server_swapObject.sqf +++ b/SQF/dayz_server/compile/server_swapObject.sqf @@ -69,8 +69,6 @@ if (!_allowed || !_proceed) exitWith { // Publish variables _object setVariable ["CharacterID",_charID,true]; -_object setVariable ["OEMPos",(_worldspace select 1),true]; - //diag_log ("PUBLISH: Attempt " + str(_object)); //get UID diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 44b71b6c0..0aeb7e4fd 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -271,7 +271,6 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith { } else { _object addMPEventHandler ["MPKilled",{_this call vehicle_handleServerKilled;}]; }; - _object setVariable ["OEMPos",_pos,true]; // used for inplace upgrades and lock/unlock of safe } else { _object enableSimulation true; };