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

Remove friendlySaving for now

Browse Source 
Achievements are saved in the state field, so we don't have room to save
friendlies there anymore. DZE_FriendlySaving is removed for now. I will
add it back later with a save to player profile instead.

The dayz_players variable is not used for anything. There were several
other unused variables in server_playerLogin.sqf.
This commit is contained in:
ebaydayz
2016-03-24 17:04:17 -04:00
parent 3ed4a95c14
commit ee13f4caf7
23 changed files with 218 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,2 +0,0 @@
PVDZ_obj_Save = [_this select 3,"all"];
publicVariableServer "PVDZ_obj_Save";

2
SQF/dayz_code/actions/pzombie/pz_feed.sqf
View File

@@ -63,7 +63,7 @@ if(!(alive _item)) then {
dayz_lastMeal = time;
dayz_hunger = 0;
PVDZ_plr_Save = [player,[],true,false];
PVDZ_plr_Save = [player,[],true];
publicVariableServer "PVDZ_plr_Save";
[player,"eat",0,false] call dayz_zombieSpeak;

18
SQF/dayz_code/compile/fn_selfActions.sqf
View File

@@ -707,18 +707,6 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
s_player_lockUnlock_crtl = -1;
};
if (DZE_AllowForceSave) then {
//Allow player to force save
if ((_isVehicle || _istypeTent) && !_isMan) then {
if (s_player_forceSave < 0) then {
s_player_forceSave = player addAction [format[localize "str_actions_save",_text], "\z\addons\dayz_code\actions\forcesave.sqf",_cursorTarget, 1, true, true];
};
} else {
player removeAction s_player_forceSave;
s_player_forceSave = -1;
};
};
if (DZE_AllowCargoCheck) then {
if ((_isVehicle || _istypeTent || (_typeOfCursorTarget in DZE_isNewStorage)) && _isAlive && !_isMan && !locked _cursorTarget) then {
if (s_player_checkGear < 0) then {
@@ -1015,8 +1003,6 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
player removeAction s_player_repair_crtl;
s_player_repair_crtl = -1;
dayz_myCursorTarget = objNull;
//player removeAction s_player_forceSave;
//s_player_forceSave = -1;
player removeAction s_player_flipveh;
s_player_flipveh = -1;
player removeAction s_player_sleep;
@@ -1090,9 +1076,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
player removeAction s_player_maintain_area;
s_player_maintain_area = -1;
player removeAction s_player_maintain_area_preview;
s_player_maintain_area_preview = -1;
player removeAction s_player_forceSave;
s_player_forceSave = -1;
s_player_maintain_area_preview = -1;
player removeAction s_player_tamedog;
s_player_tamedog = -1;
player removeAction s_player_feeddog;

13
SQF/dayz_code/init/variables.sqf
View File

@@ -210,7 +210,6 @@ dayz_resetSelfActions = {
s_player_pzombiesfeed = -1;
s_player_tamedog = -1;
s_player_parts_crtl = -1;
s_player_forceSave = -1;
s_player_checkGear = -1;
s_player_movedog = -1;
s_player_speeddog = -1;
@@ -534,11 +533,8 @@ if(isNil "dayz_sellDistance_vehicle") then {dayz_sellDistance_vehicle = 10;};
if(isNil "dayz_sellDistance_boat") then {dayz_sellDistance_boat = 30;};
if(isNil "dayz_sellDistance_air") then {dayz_sellDistance_air = 40;};
if(isNil "dayz_paraSpawn") then {dayz_paraSpawn = false;};
if(isNil "dayz_minpos") then {dayz_minpos = -20000;};
if(isNil "dayz_maxpos") then {dayz_maxpos = 20000;};
if(isNil "DZE_BuildingLimit") then {DZE_BuildingLimit = 150;};
if(isNil "DZE_HumanityTargetDistance") then {DZE_HumanityTargetDistance = 25;};
if(isNil "DZE_FriendlySaving") then {DZE_FriendlySaving = true;};
if(isNil "DZE_BuildOnRoads") then {DZE_BuildOnRoads = false;};
if(isNil "DZE_MissionLootTable") then {DZE_MissionLootTable = false;};
if(isNil "DZE_ConfigTrader") then {DZE_ConfigTrader = false;};
@@ -555,9 +551,15 @@ if(isNil "DZE_maintainRange") then {DZE_maintainRange = ((DZE_PlotPole select 0)
if(isNil "DZE_HeartBeat") then {DZE_HeartBeat = false;};
if(isNil "DZE_UseBloodTypes") then {DZE_UseBloodTypes = false;};
if(isNil "DZE_slowZombies") then {DZE_slowZombies = false;};
if ((toLower worldName) in ["napf","sauerland","tavi"]) then {
dayz_minpos = if ((toLower worldName) == "tavi") then {-26000} else {-1000};
dayz_maxpos = 26000;
} else {
dayz_minpos = -20000;
dayz_maxpos = 20000;
};
if (isServer) then {
dayz_players = [];
dead_bodyCleanup = [];
needUpdate_objects = [];
Server_InfectedCamps = [];
@@ -706,7 +708,6 @@ if (!isDedicated) then {
Dayz_freefall = [ time, 0, 0.1 ];
// EPOCH ADDITIONS
if(isNil "DZE_AllowForceSave") then {DZE_AllowForceSave = false;};
if(isNil "DZE_AllowCargoCheck") then {DZE_AllowCargoCheck = true;};
if(isNil "DZE_ForceNameTags") then {DZE_ForceNameTags = false;};
if(isNil "DZE_ForceNameTagsOff") then {DZE_ForceNameTagsOff = false;};

4
SQF/dayz_code/system/player_monitor.fsm
View File

@@ -1078,9 +1078,7 @@ class FSM
" //Reload players state" \n
" if (count _state > 2) then {" \n
" dayz_temperatur = _state select 2;" \n
" if ((count _state > 3) && DZE_FriendlySaving) then {" \n
" DZE_Friends = _state select 3;" \n
" };" \n
" };" \n
"} else {" \n
" _currentWpn = ""Makarov"";" \n
" _currentAnim = ""aidlpercmstpsraswpstdnon_player_idlesteady02"";" \n