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

TLDR

Browse Source 
unused dayz_disco variables commented out
player sync already does 10m nearby  gear update so only perform if no
sync was.
moved dayz_recordlogin to under !isNull _object check to prevent db call
if player isnull.
This commit is contained in:
[VB]AWOL
2013-10-27 09:27:45 -05:00
parent 668cd0c1c4
commit b19d85d32d
10 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_anim/config.cpp
View File

File diff suppressed because one or more lines are too long

2
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -149,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version class DAYZ_Version : CA_Version
{ {
idc = -1; idc = -1;
text = "DayZ Epoch 1.0.2.4"; text = "DayZ Epoch 1.0.2.5";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
}; };
delete CA_TitleMainMenu; delete CA_TitleMainMenu;

2
SQF/dayz_code/config.cpp
View File

@@ -41,7 +41,7 @@ class CfgMods
hidePicture = 0; hidePicture = 0;
hideName = 0; hideName = 0;
action = "http://www.dayzepoch.com"; action = "http://www.dayzepoch.com";
version = "1.0.2.41"; version = "1.0.2.42";
hiveVersion = 0.96; //0.93 hiveVersion = 0.96; //0.93
}; };
}; };

4
SQF/dayz_code/init/publicEH.sqf
View File

@@ -29,8 +29,8 @@
//Server only //Server only
if (isServer) then { if (isServer) then {
"PVDZE_plr_Died" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied}; "PVDZE_plr_Died" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied};
"PVDZE_plr_DiscAdd" addPublicVariableEventHandler {dayz_disco set [count dayz_disco,(_this select 1)];}; //"PVDZE_plr_DiscAdd" addPublicVariableEventHandler {dayz_disco set [count dayz_disco,(_this select 1)];};
"PVDZE_plr_DiscRem" addPublicVariableEventHandler {dayz_disco = dayz_disco - [(_this select 1)];}; //"PVDZE_plr_DiscRem" addPublicVariableEventHandler {dayz_disco = dayz_disco - [(_this select 1)];};
"PVDZE_plr_Save" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerSync;}; "PVDZE_plr_Save" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerSync;};
"PVDZE_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj}; "PVDZE_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj};
"PVDZE_veh_Update" addPublicVariableEventHandler {_id = (_this select 1) spawn server_updateObject}; "PVDZE_veh_Update" addPublicVariableEventHandler {_id = (_this select 1) spawn server_updateObject};

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

@@ -1357,7 +1357,7 @@ class FSM
priority = 2.000000; priority = 2.000000;
to="ERROR__No_Player_1"; to="ERROR__No_Player_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.4"") || (_myEpochB != ""1.0.2.4"") || (_myEpochB != ""1.0.2.4"") || (_myEpochSfx != ""1.0.2.4"")"/*%FSM</CONDITION""">*/; condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.5"") || (_myEpoch != ""1.0.2.5"") || (_myEpochB != ""1.0.2.5"") || (_myEpochSfx != ""1.0.2.5"")"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/; action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
}; };
/*%FSM</LINK>*/ /*%FSM</LINK>*/

2
SQF/dayz_epoch/config.cpp
View File

@@ -3,7 +3,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = 0.1; requiredVersion = 0.1;
dayzVersion = "1.0.2.4"; dayzVersion = "1.0.2.5";
requiredAddons[] = {"dayz_code"}; requiredAddons[] = {"dayz_code"};
}; };
}; };

2
SQF/dayz_epoch_b/config.cpp
View File

@@ -3,7 +3,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = 0.1; requiredVersion = 0.1;
dayzVersion = "1.0.2.4"; dayzVersion = "1.0.2.5";
requiredAddons[] = {"dayz_code"}; requiredAddons[] = {"dayz_code"};
}; };
}; };

19
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -30,15 +30,15 @@ if ((_timeout - time) > 0) then {
[nil,nil,"per",rTITLETEXT,_message,"PLAIN DOWN"] call RE; [nil,nil,"per",rTITLETEXT,_message,"PLAIN DOWN"] call RE;
}; };
diag_log format["DISCONNECT: %1 (%2) Object: %3, _characterID: %4", _playerName,_playerID,_object,_characterID]; //dayz_disco = dayz_disco - [_playerID];
_id = [_playerID,_characterID,2] spawn dayz_recordLogin;
dayz_disco = dayz_disco - [_playerID];
if (!isNull _object) then { if (!isNull _object) then {
//Update Vehicle
{ [_x,"gear"] call server_updateObject } foreach diag_log format["DISCONNECT: %1 (%2) Object: %3, _characterID: %4", _playerName,_playerID,_object,_characterID];
(nearestObjects [getPosATL _object, dayz_updateObjects, 10]);
_id = [_playerID,_characterID,2] spawn dayz_recordLogin;
if (alive _object) then { if (alive _object) then {
_isplayernearby = (DZE_BackpackGuard and!_invehicle and ({isPlayer _x} count (_object nearEntities ["AllVehicles", 5]) > 1)); _isplayernearby = (DZE_BackpackGuard and!_invehicle and ({isPlayer _x} count (_object nearEntities ["AllVehicles", 5]) > 1));
[_object,(magazines _object),true,true,_isplayernearby] call server_playerSync; [_object,(magazines _object),true,true,_isplayernearby] call server_playerSync;
@@ -53,5 +53,10 @@ if (!isNull _object) then {
_myGroup = group _object; _myGroup = group _object;
deleteVehicle _object; deleteVehicle _object;
deleteGroup _myGroup; deleteGroup _myGroup;
} else {
//Update Vehicle
{
[_x,"gear"] call server_updateObject;
} foreach (nearestObjects [getPosATL _object, dayz_updateObjects, 10]);
}; };
}; };

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

@@ -74,11 +74,13 @@ if (_killerName != "nil") then
}; };
// Might not be the best way... // Might not be the best way...
/*
if (isnil "dayz_disco") then { if (isnil "dayz_disco") then {
dayz_disco = []; dayz_disco = [];
}; };
*/
dayz_disco = dayz_disco - [_playerID]; // dayz_disco = dayz_disco - [_playerID];
_newObject setVariable["processedDeath",time]; _newObject setVariable["processedDeath",time];
if (typeName _minutes == "STRING") then if (typeName _minutes == "STRING") then

2
SQF/dayz_sfx/config.cpp
View File

@@ -22,7 +22,7 @@ class CfgPatches {
units[] = {}; units[] = {};
weapons[] = {}; weapons[] = {};
requiredVersion = 0.1; requiredVersion = 0.1;
dayzVersion = "1.0.2.4"; dayzVersion = "1.0.2.5";
requiredAddons[] = {}; requiredAddons[] = {};
}; };
}; };