diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index fcaf47c49..9810f952b 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -48,7 +48,7 @@ if (count _this > 0) then { }; //Send Death Notice -diag_log format["Debug death message vars: %1 %2 %3 %4 %5 %6 %7 %8 %9 %10",dayz_characterID,0,_body,_playerID,_bodyName,_infected,_killerName,_killerWeapon,_killerDist,_killerMethod]; +diag_log format["Debug death message vars: CharacterID:%1 BodyObject:%3 UID:%4 PlayerName:%5 Infected:%6 KillerName:%7 KillerWeapon:%8 KillerDistance:%9 KillerMethod:%10",dayz_characterID,0,_body,_playerID,_bodyName,_infected,_killerName,_killerWeapon,_killerDist,_killerMethod]; PVDZ_plr_Death = [dayz_characterID,0,_body,_playerID,toArray _bodyName,_infected,toArray _killerName,toArray _killerWeapon,_killerDist,toArray _killerMethod]; //Send name as array to avoid publicVariable value restrictions publicVariableServer "PVDZ_plr_Death"; @@ -138,7 +138,7 @@ playMusic "dayz_track_death_1"; uiSleep 2; for "_x" from 5 to 1 step -1 do { - [format[localize "str_return_lobby",_x],1] call dayz_rollingMessages; + titleText [format[localize "str_return_lobby",_x], "PLAIN DOWN", 1]; uiSleep 1; }; diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf index e3194a80f..d8c4b07be 100644 --- a/SQF/dayz_code/configVariables.sqf +++ b/SQF/dayz_code/configVariables.sqf @@ -25,8 +25,6 @@ DZE_DamageBeforeMaint = 0.09; // Minimum damage built items must have before the DZE_DeathMsgGlobal = false; // Display death messages in global chat DZE_DeathMsgSide = false; // Display death messages in side chat DZE_DeathMsgTitleText = false; // Display death messages as title text -DZE_DiagFps = 1; // Log server FPS and player count 0 = Off, 1 = every 5 minutes, 2 = every 2 minutes -DZE_DiagObjects = false; // Also log allMissionObjects count (very intensive) DZE_HaloJump = true; // Enable halo jumping out of air vehicles above 400m DZE_modularBuild = true; // Enable Snap building by @raymix DZE_snapExtraRange = 0; // Increase the default range from which objects can snap by this many meters. diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 0b1d3b663..bdaa5551b 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -209,14 +209,6 @@ dayz_reseed = { //} forEach dayz_grid; }; -dze_diag_fps = { - if (DZE_DiagObjects) then { - diag_log format["SERVER FPS: %1 PLAYERS: %2 OBJECTS: %3",diag_fps,playersNumber west,count (allMissionObjects "")]; - } else { - diag_log format["SERVER FPS: %1 PLAYERS: %2",diag_fps,playersNumber west]; - }; -}; - generate_new_damage = { private "_damage"; _damage = ((random(DynamicVehicleDamageHigh-DynamicVehicleDamageLow))+DynamicVehicleDamageLow) / 100; diff --git a/SQF/dayz_server/system/s_fps.sqf b/SQF/dayz_server/system/s_fps.sqf index 73d7c2837..ca0b2d7f7 100644 --- a/SQF/dayz_server/system/s_fps.sqf +++ b/SQF/dayz_server/system/s_fps.sqf @@ -1,8 +1,5 @@ -// replaced with dze_diag_fps - -/* -while {isServer} do { - diag_log ("DEBUG FPS : " + str(diag_fps) ); - sleep 360; +while {true} do { + diag_log format["SERVER FPS: %1 PLAYERS: %2",diag_fps,playersNumber west]; + //diag_log format["SERVER FPS: %1 PLAYERS: %2 OBJECTS: %3",diag_fps,playersNumber west,count (allMissionObjects "")]; // very intensive + uiSleep 360; }; -*/ \ No newline at end of file diff --git a/SQF/dayz_server/system/scheduler/sched_corpses.sqf b/SQF/dayz_server/system/scheduler/sched_corpses.sqf index 9a12a7692..cd303915f 100644 --- a/SQF/dayz_server/system/scheduler/sched_corpses.sqf +++ b/SQF/dayz_server/system/scheduler/sched_corpses.sqf @@ -27,7 +27,6 @@ sched_co_deleteVehicle = { sched_corpses = { private ["_delQtyZ","_delQtyP","_addFlies","_x","_deathTime","_onoff","_delQtyAnimal", "_sound", "_deathPos", "_cpos"]; // EVERY 2 MINUTE - if (DZE_DiagFps == 2) then {call dze_diag_fps;}; // DELETE UNCONTROLLED ZOMBIES --- PUT FLIES ON FRESH PLAYER CORPSES --- REMOVE OLD FLIES & CORPSES _delQtyZ = 0; _delQtyP = 0; diff --git a/SQF/dayz_server/system/scheduler/sched_lootpiles.sqf b/SQF/dayz_server/system/scheduler/sched_lootpiles.sqf index e4deea91a..2deaefd1b 100644 --- a/SQF/dayz_server/system/scheduler/sched_lootpiles.sqf +++ b/SQF/dayz_server/system/scheduler/sched_lootpiles.sqf @@ -45,7 +45,6 @@ sched_lootpiles_5m = { sched_lootpiles = { private ["_plrBatch","_chunkSize","_imax","_plr","_i","_x", "_changed"]; // EVERY 5 MINUTES, ONE OF THESE TASKS SPACED BY 5 SECONDS: - if (DZE_DiagFps == 1) then {call dze_diag_fps;}; // LOOK FOR OLD LOOTPILES -OR- IGNORE LOOTPILES NEAR _plrBatch PLAYERS -OR- REMOVE REMAINING _chunkSize LOOTPILES _chunkSize = 50; _plrBatch = 10; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 6282becc8..2416a4b7b 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -1,5 +1,5 @@ private ["_date","_year","_month","_day","_hour","_minute","_date1","_hiveResponse","_key","_objectCount","_dir","_point","_i","_action","_dam","_selection","_wantExplosiveParts","_entity","_worldspace","_damage","_booleans","_rawData","_ObjectID","_class","_CharacterID","_inventory","_hitpoints","_fuel","_id","_objectArray","_script","_result","_outcome"]; -//[]execVM "\z\addons\dayz_server\system\s_fps.sqf"; //server monitor FPS (writes each ~181s diag_fps+181s diag_fpsmin*) +[]execVM "\z\addons\dayz_server\system\s_fps.sqf"; //server monitor FPS (writes each ~181s diag_fps+181s diag_fpsmin*) #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" waitUntil {!isNil "BIS_MPF_InitDone"};