W0LF/DayZ-Epoch
1
0 Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-10-04 18:49:34 +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 committed 2013-10-27 09:27:45 -05:00
1 parent 668cd0c1c4
commit b19d85d32d
10 files changed
+22 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SQF/dayz_anim/config.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ class CfgPatches {
weapons[] = {};
requiredVersion = 0.1;
requiredAddons[] = {"CAData","HALO_Test","CAAnimals","CA_Anims","CA_Anims_Sdr","CA_Anims_Wmn","CA_Anims_E","CA_Anims_E_Sdr","CA_Anims_E_Wmn","CABuildings","CA_E","CA_PMC","CA_Heads","CAData_ParticleEffects","CA_Dubbing","CA_Dubbing_Counterattack","CA_Dubbing_E","CA_Dubbing_PMC","CA_Editor","CALanguage","CALanguage_e","CALanguage_PMC","CALanguage_missions","CALanguage_missions_e","CALanguage_missions_PMC","CA_HC_Sounds","CA_Modules","CA_Missions_AlternativeInjurySimulation","CA_Modules_Alice","CA_Missions_AmbientCombat","CA_Modules_Animals","CA_Missions_BattlefieldClearance","CA_Modules_clouds","CA_Modules_Coin","CA_Modules_DynO","CA_Missions_FirstAidSystem","CA_Modules_Functions","CA_Missions_GarbageCollector","CA_HighCommand","CA_Modules_Marta","CA_Modules_Silvie","BI_SRRS","CA_Modules_UAV","CA_Modules_ZoRA","CA_Modules_E","CA_Modules_Alice2","CA_Modules_E_DynO","CA_Modules_E_Functions","CA_Modules_E_Gita","CA_Modules_E_Jukebox","CA_Modules_E_OO","CA_Support","CA_Modules_E_UAV","CA_Modules_E_UAV_Heli","CA_Modules_E_Weather","CA_Modules_PMC","CA_Modules_PMC_Functions","CA_Modules_PMC_SimpleFIrstAid","CA_MPA","CA_MPA_Core","CA_MPA_Challenges","CA_MPA_Scenarios","CAMusic","CARoads2","CARoads2Bridge","CARoads2Dam","CARoads_E","CARoads_PMC_Bridge","CARocks2","CARocks_E","CASigns2","CASounds_Missions","CA_SoundsMissions_E","CASounds","CA_Sounds_Baf","CASounds_E","CAStructures","CAStructures_A_BuildingWIP","CAStructures_A_CraneCon","CAStructuresLand_A_MunicipalOffice","CAStructuresBarn_W","CAStructures_Castle","CAStructuresHouse","CAStructuresHouse_A_FuelStation","CAStructuresHouse_A_Hospital","CAStructuresHouse_A_Office01","CAStructuresHouse_A_Office02","CAStructuresHouse_a_stationhouse","CAStructuresHouse_Church_02","CAStructuresHouse_Church_03","CAStructuresHouse_Church_05R","CAStructuresHouse_HouseBT","CAStructuresHouse_HouseV2","CAStructuresHouse_HouseV","CAStructuresLand_Ind_Stack_Big","CAStructures_IndPipe1","CAStructuresInd_Quarry","Ind_SawMill","CAStructures_Mil","CAStructures_Misc_Powerlines","CAStructures_Nav","CAStructuresLand_Nav_Boathouse","pond_test","CAStructures_Proxy_BuildingParts","CAStructures_Proxy_Ruins","CAStructures_Rail","CAStructuresHouse_rail_station_big","CAStructures_Ruins","CAStructuresShed_Small","CAStructuresHouse_Shed_Ind","CAStructures_Wall","CAFonts","Utes","CAVideo2_PMC","CA_Animals2","CA_Animals2_Anim_Config","CA_Animals2_Chicken","CA_Animals2_Cow","CA_Animals2_Dogs","CA_Animals2_Dogs_Fin","CA_Animals2_Dogs_Pastor","CA_Animals2_Goat","CA_Animals2_Rabbit","CA_Animals2_Sheep","CA_Animals2_WildBoar","CA_Animals_E","CA_Anims_Char","CABuildings2","A_Crane_02","A_GeneralStore_01","CABuildings2_A_Pub","A_statue","Barn_Metal","Church_01","Farm_Cowshed","Farm_WTower","CAHouseBlock_A","CAHouseBlock_B","CAHouseBlock_C","CAHouseBlock_D","HouseRuins","Ind_Dopravnik","Ind_Expedice","Ind_MalyKomin","Ind_Mlyn","Ind_Pec","ind_silomale","Ind_SiloVelke","Ind_Vysypka","Ind_Garage01","CAStructures_IndPipe1_todo_delete","IndPipe2","Ind_Shed_01","Ind_Shed_02","Ind_Tank","Ind_Workshop01","CABuildings2_Misc_Cargo","Misc_PowerStation","Misc_WaterStation","Rail_House_01","Shed_small","Shed_wooden","CA_E_ParticleEffects","CA_DubbingRadio_E","CAMisc_fix","CAMisc_fix_Str","CA_Missions","CA_Missions_E","CAMusic_E","CAMusic_PMC","A_TVTower","CAStructures_Nav_pier","CAStructures_Railway","CAStructures_E","CAStructures_E_HouseA","CAStructures_E_HouseA_A_BuildingWIP","CAStructures_E_HouseA_A_CityGate1","CAStructures_E_HouseA_A_Minaret","CAStructures_E_HouseA_A_Minaret_Porto","CAStructures_E_HouseA_A_Mosque_big","CAStructures_E_HouseA_A_Mosque_small","CAStructures_E_HouseA_A_Office01","CAStructures_E_HouseA_a_stationhouse","CAStructures_E_HouseA_A_Statue","CAStructures_E_HouseA_A_Villa","CAStructures_E_HouseC","CAStructures_E_HouseK","CAStructures_E_HouseL","CAStructures_E_Ind","CAStructures_E_Ind_Ind_Coltan_Mine","CAStructures_E_Ind_Ind_FuelStation","CAStructures_E_Ind_Ind_Garage01","CAStructures_E_Ind_Oil_Mine","CAStructures_E_Ind_IndPipes","CAStructures_E_Ind_Misc_PowerStation","CAStructures_E_Ind_Ind_Shed","CAStructures_E_Mil","CAStructures_E_Misc","CAStructures_E_Misc_Misc_cables","CAStructures_E_Misc_Misc_Construction","CAStructures_E_Misc_Misc_Garbage","CAStructures_E_Misc_Misc_Lamp","CAStructures_E_Misc_Misc_powerline","CAStructures_E_Misc_Misc_Water","CAStructures_E_Misc_Misc_Well","CAStructures_E_Wall","CAStructures_E_Wall_Wall_L","CAStructures_PMC","CAStructures_PMC_Buildings","CAStructures_PMC_Buildings_Bunker","CAStructures_PMC_Buildings_GeneralStore_PMC","CAStructures_PMC_Buildings_Ruin_Cowshed","CAStructures_PMC_Ind","CAStructures_PMC_FuelStation","CAStructures_PMC_Misc","CAStructures_PMC_Misc_Shed","CAStructures_PMC_Ruins","CAStructures_PMC_Walls","CAUI","CAWeapons","CAWeapons_AK","CAWeapons_AmmoBoxes","CAWeapons_bizon","CAWeapons_Colt1911","CAWeapons_DMR","CAweapons_ksvk","CAWeapons_M1014","CAweapons_m107","CAWeapons_M252_81mm_Mortar","CAWeapons_Metis_AT_13","CAWeapons_2b14_82mm_Mortar","CAWeLine truncated
dayzVersion = "1.0.2.4";
dayzVersion = "1.0.2.5";
};
};
SQF/dayz_code/Configs/rscTitles.hpp
+1 -1
View File
@@ -149,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version
{
idc = -1;
text = "DayZ Epoch 1.0.2.4";
text = "DayZ Epoch 1.0.2.5";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
};
delete CA_TitleMainMenu;
SQF/dayz_code/config.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ class CfgMods
hidePicture = 0;
hideName = 0;
action = "http://www.dayzepoch.com";
version = "1.0.2.41";
version = "1.0.2.42";
hiveVersion = 0.96; //0.93
};
};
SQF/dayz_code/init/publicEH.sqf
+2 -2
View File
@@ -29,8 +29,8 @@
//Server only
if (isServer) then {
"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_DiscRem" addPublicVariableEventHandler {dayz_disco = 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_Save" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerSync;};
"PVDZE_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj};
"PVDZE_veh_Update" addPublicVariableEventHandler {_id = (_this select 1) spawn server_updateObject};
SQF/dayz_code/system/player_monitor.fsm
+1 -1
View File
@@ -1357,7 +1357,7 @@ class FSM
priority = 2.000000;
to="ERROR__No_Player_1";
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""">*/;
};
/*%FSM</LINK>*/
SQF/dayz_epoch/config.cpp
+1 -1
View File
@@ -3,7 +3,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.1;
dayzVersion = "1.0.2.4";
dayzVersion = "1.0.2.5";
requiredAddons[] = {"dayz_code"};
};
};
SQF/dayz_epoch_b/config.cpp
+1 -1
View File
@@ -3,7 +3,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.1;
dayzVersion = "1.0.2.4";
dayzVersion = "1.0.2.5";
requiredAddons[] = {"dayz_code"};
};
};
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
+10 -5
View File
@@ -30,15 +30,15 @@ if ((_timeout - time) > 0) then {
[nil,nil,"per",rTITLETEXT,_message,"PLAIN DOWN"] call RE;
};
//dayz_disco = dayz_disco - [_playerID];
if (!isNull _object) then {
diag_log format["DISCONNECT: %1 (%2) Object: %3, _characterID: %4", _playerName,_playerID,_object,_characterID];
_id = [_playerID,_characterID,2] spawn dayz_recordLogin;
dayz_disco = dayz_disco - [_playerID];
if (!isNull _object) then {
//Update Vehicle
{ [_x,"gear"] call server_updateObject } foreach
(nearestObjects [getPosATL _object, dayz_updateObjects, 10]);
if (alive _object) then {
_isplayernearby = (DZE_BackpackGuard and!_invehicle and ({isPlayer _x} count (_object nearEntities ["AllVehicles", 5]) > 1));
[_object,(magazines _object),true,true,_isplayernearby] call server_playerSync;
@@ -53,5 +53,10 @@ if (!isNull _object) then {
_myGroup = group _object;
deleteVehicle _object;
deleteGroup _myGroup;
} else {
//Update Vehicle
{
[_x,"gear"] call server_updateObject;
} foreach (nearestObjects [getPosATL _object, dayz_updateObjects, 10]);
};
};
SQF/dayz_server/compile/server_playerDied.sqf
+3 -1
View File
@@ -74,11 +74,13 @@ if (_killerName != "nil") then
};
// Might not be the best way...
/*
if (isnil "dayz_disco") then {
dayz_disco = [];
};
*/
dayz_disco = dayz_disco - [_playerID];
// dayz_disco = dayz_disco - [_playerID];
_newObject setVariable["processedDeath",time];
if (typeName _minutes == "STRING") then
SQF/dayz_sfx/config.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.1;
dayzVersion = "1.0.2.4";
dayzVersion = "1.0.2.5";
requiredAddons[] = {};
};
};