From 38cca1cb77fdfe13d23fece1436af9f60525ba1d Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 26 Aug 2013 03:11:45 -0500 Subject: [PATCH] commented some diag_logs to reduce log spam --- SQF/dayz_code/compile/fn_selfActions.sqf | 2 +- SQF/dayz_code/compile/fn_unconscious.sqf | 4 +-- SQF/dayz_code/compile/player_switchModel.sqf | 26 ++++++++++--------- SQF/dayz_code/compile/player_unlockVault.sqf | 3 --- SQF/dayz_code/compile/server_updatePlayer.sqf | 2 +- .../compile/server_onPlayerDisconnect.sqf | 2 +- SQF/dayz_server/compile/server_spawnEvent.sqf | 2 +- SQF/dayz_server/compile/server_traders.sqf | 6 ++--- .../compile/server_updateObject.sqf | 14 +++++----- SQF/dayz_server/init/server_functions.sqf | 8 +++--- SQF/dayz_server/modules/crash_spawner.sqf | 4 +-- SQF/dayz_server/system/server_monitor.sqf | 6 ++--- 12 files changed, 39 insertions(+), 40 deletions(-) diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index f72c63527..d8dade52a 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -605,7 +605,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu // Static Menu { - diag_log format["DEBUG TRADER: %1", _x]; + //diag_log format["DEBUG TRADER: %1", _x]; _buy = player addAction [format["Trade %1 %2 for %3 %4",(_x select 3),(_x select 5),(_x select 2),(_x select 6)], "\z\addons\dayz_code\actions\trade_items_wo_db.sqf",[(_x select 0),(_x select 1),(_x select 2),(_x select 3),(_x select 4),(_x select 5),(_x select 6)], (_x select 7), true, true, "",""]; s_player_parts set [count s_player_parts,_buy]; diff --git a/SQF/dayz_code/compile/fn_unconscious.sqf b/SQF/dayz_code/compile/fn_unconscious.sqf index ddfe9153d..2f206bdc5 100644 --- a/SQF/dayz_code/compile/fn_unconscious.sqf +++ b/SQF/dayz_code/compile/fn_unconscious.sqf @@ -18,7 +18,7 @@ if ((!r_player_handler1) and (r_handlerCount == 0)) then { disableUserInput true; //waitUntil{USEC_MotherInbox == ""}; //["MED001",0,"Unconscious"] call fnc_usec_recordEventClient; - diag_log "CLIENT: Unconscious..."; + //diag_log "CLIENT: Unconscious..."; while {(r_player_unconscious)} do { _ctrl1 ctrlSetPosition [(_ctrl1Pos select 0),(_ctrl1Pos select 1),(_ctrl1Pos select 2),((0.136829 * safezoneH) * (1 -(r_player_timeout / _totalTimeout)))]; _ctrl1 ctrlCommit 1; @@ -87,7 +87,7 @@ if ((!r_player_handler1) and (r_handlerCount == 0)) then { }; }; 4 cutRsc ["default", "PLAIN",1]; - diag_log "CLIENT: Conscious..."; + //diag_log "CLIENT: Conscious..."; disableUserInput false; //waitUntil{USEC_MotherInbox == ""}; //["MED001",0,"Conscious"] call fnc_usec_recordEventClient; diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index ab1fa6c4a..76f3f4bfa 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -63,12 +63,13 @@ private ["_newBackpackType","_backpackWpn","_backpackMag"]; }; //Debug Message - diag_log "Attempting to switch model"; - diag_log str(_weapons); - diag_log str(_magazines); - diag_log (str(_backpackWpn)); - diag_log (str(_backpackMag)); - +/* +diag_log "Attempting to switch model"; +diag_log str(_weapons); +diag_log str(_magazines); +diag_log (str(_backpackWpn)); +diag_log (str(_backpackMag)); +*/ //Secure Player for Transformation player setPosATL dayz_spawnPos; @@ -173,12 +174,13 @@ private ["_newBackpackType","_backpackWpn","_backpackMag"]; }; }; //Debug Message - diag_log "Swichtable Unit Created. Equipment:"; - diag_log str(weapons _newUnit); - diag_log str(magazines _newUnit); - diag_log str(getWeaponCargo unitBackpack _newUnit); - diag_log str(getMagazineCargo unitBackpack _newUnit); - +/* +diag_log "Swichtable Unit Created. Equipment:"; +diag_log str(weapons _newUnit); +diag_log str(magazines _newUnit); +diag_log str(getWeaponCargo unitBackpack _newUnit); +diag_log str(getMagazineCargo unitBackpack _newUnit); +*/ //Make New Unit Playable addSwitchableUnit _newUnit; setPlayable _newUnit; diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index cc327746a..db7667ceb 100644 --- a/SQF/dayz_code/compile/player_unlockVault.sqf +++ b/SQF/dayz_code/compile/player_unlockVault.sqf @@ -28,9 +28,6 @@ if(isNull _obj or !(alive _obj)) exitWith { TradeInprogress = false; }; _ownerID = _obj getVariable["CharacterID","0"]; -diag_log format["Combination: %1", dayz_combination]; - - if (_alreadyPacking == 1) exitWith {TradeInprogress = false; cutText [format["That %1 is already being unlocked.",_text], "PLAIN DOWN"]}; // Promt user for password if _ownerID != dayz_playerUID diff --git a/SQF/dayz_code/compile/server_updatePlayer.sqf b/SQF/dayz_code/compile/server_updatePlayer.sqf index 89bb1aaf6..ea9dbfde6 100644 --- a/SQF/dayz_code/compile/server_updatePlayer.sqf +++ b/SQF/dayz_code/compile/server_updatePlayer.sqf @@ -167,7 +167,7 @@ if ((count _updates > 0 or _isNewMed) and _characterID != "0") then { //Wait for HIVE to be free //Send request _key = format["CHILD:201:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:",_characterID,_playerPos,_playerGear,_playerBackp,_medical,_justAte,_justDrank,_kills,_headShots,_distanceFoot,_timeSince,_currentState,_killsH,_killsB,_currentModel,_humanity]; - diag_log ("HIVE: WRITE: "+ str(_key) + " / " + _characterID); + // diag_log ("HIVE: WRITE: "+ str(_key) + " / " + _characterID); _key spawn server_hiveWrite; _character setVariable ["updatePlayer",[false,false,false,false,false],true]; _character setVariable ["medForceUpdate",false]; diff --git a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf index cd911ef2f..81c9a95df 100644 --- a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf +++ b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf @@ -20,7 +20,7 @@ if ((_timeout - time) > 0) then { _object setVariable["unconsciousTime",300,true]; #ifdef DZE_SERVER_DEBUG diag_log format["COMBAT LOGGED: %1 (%2)", _playerName,_timeout]; - diag_log format["SET UNCONCIOUSNESS: %1", _playerName]; + //diag_log format["SET UNCONCIOUSNESS: %1", _playerName]; #endif // Message whole server when player combat logs diff --git a/SQF/dayz_server/compile/server_spawnEvent.sqf b/SQF/dayz_server/compile/server_spawnEvent.sqf index 38af9d60a..3cc91ee2f 100644 --- a/SQF/dayz_server/compile/server_spawnEvent.sqf +++ b/SQF/dayz_server/compile/server_spawnEvent.sqf @@ -51,7 +51,7 @@ while {true} do { // Once a minute. EventSchedulerLastTime = _datestr; - diag_log ("EVENTS: Local Time is: " + _datestr); + //diag_log ("EVENTS: Local Time is: " + _datestr); { if([[(_x select 0),(_x select 1),(_x select 2),(_x select 3),(_x select 4)],_date] call epoch_eventIsAny) then { diag_log ("RUNNING EVENT: " + (_x select 5) + " on " + _datestr); diff --git a/SQF/dayz_server/compile/server_traders.sqf b/SQF/dayz_server/compile/server_traders.sqf index c58f14e67..d09bcf318 100644 --- a/SQF/dayz_server/compile/server_traders.sqf +++ b/SQF/dayz_server/compile/server_traders.sqf @@ -4,7 +4,7 @@ _character = _this select 0; _traderid = _this select 1; _clientID = owner _character; -diag_log ("HIVE: Menu Request by ClientID: "+ str(_clientID)); +//diag_log ("HIVE: Menu Request by ClientID: "+ str(_clientID)); // add cacheing _retrader = call compile format["ServerTcache_%1;",_traderid]; @@ -16,7 +16,7 @@ if(isNil "_retrader") then { _key = format["CHILD:399:%1:",_traderid]; _data = "HiveEXT" callExtension _key; - diag_log "HIVE: Request sent"; + //diag_log "HIVE: Request sent"; //Process result _result = call compile format ["%1",_data]; @@ -25,7 +25,7 @@ if(isNil "_retrader") then { if (_status == "ObjectStreamStart") then { _val = _result select 1; //Stream Objects - diag_log ("HIVE: Commence Menu Streaming..."); + //diag_log ("HIVE: Commence Menu Streaming..."); call compile format["ServerTcache_%1 = [];",_traderid]; for "_i" from 1 to _val do { _data = "HiveEXT" callExtension _key; diff --git a/SQF/dayz_server/compile/server_updateObject.sqf b/SQF/dayz_server/compile/server_updateObject.sqf index 82e8711b1..01a9ce8ff 100644 --- a/SQF/dayz_server/compile/server_updateObject.sqf +++ b/SQF/dayz_server/compile/server_updateObject.sqf @@ -51,7 +51,7 @@ _object_position = { _fuel = fuel _object; }; _key = format["CHILD:305:%1:%2:%3:",_objectID,_worldspace,_fuel]; - diag_log ("HIVE: WRITE: "+ str(_key)); + //diag_log ("HIVE: WRITE: "+ str(_key)); _key call server_hiveWrite; }; @@ -70,7 +70,7 @@ _object_inventory = { } else { _key = format["CHILD:303:%1:%2:",_objectID,_inventory]; }; - diag_log ("HIVE: WRITE: "+ str(_key)); + //diag_log ("HIVE: WRITE: "+ str(_key)); _key call server_hiveWrite; }; }; @@ -88,7 +88,7 @@ _object_damage = { } forEach _hitpoints; _key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage]; - diag_log ("HIVE: WRITE: "+ str(_key)); + //diag_log ("HIVE: WRITE: "+ str(_key)); _key call server_hiveWrite; _object setVariable ["needUpdate",false,true]; }; @@ -112,7 +112,7 @@ _object_killed = { } else { _key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage]; }; - diag_log ("HIVE: WRITE: "+ str(_key)); + //diag_log ("HIVE: WRITE: "+ str(_key)); _key call server_hiveWrite; _object setVariable ["needUpdate",false,true]; }; @@ -130,7 +130,7 @@ _object_repair = { } forEach _hitpoints; _key = format["CHILD:306:%1:%2:%3:",_objectID,_array,_damage]; - diag_log ("HIVE: WRITE: "+ str(_key)); + //diag_log ("HIVE: WRITE: "+ str(_key)); _key call server_hiveWrite; _object setVariable ["needUpdate",false,true]; }; @@ -145,7 +145,7 @@ switch (_type) do { }; case "position": { if (!(_object in needUpdate_objects)) then { - diag_log format["DEBUG Position: Added to NeedUpdate=%1",_object]; + //diag_log format["DEBUG Position: Added to NeedUpdate=%1",_object]; needUpdate_objects set [count needUpdate_objects, _object]; }; }; @@ -157,7 +157,7 @@ switch (_type) do { call _object_damage; } else { if (!(_object in needUpdate_objects)) then { - diag_log format["DEBUG Damage: Added to NeedUpdate=%1",_object]; + //diag_log format["DEBUG Damage: Added to NeedUpdate=%1",_object]; needUpdate_objects set [count needUpdate_objects, _object]; }; }; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index c72f1b7b5..25ed14669 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -74,10 +74,10 @@ check_publishobject = { _allowed = false; - diag_log format ["DEBUG: Checking if Object: %1 is allowed published by %2", _object, _playername]; + //diag_log format ["DEBUG: Checking if Object: %1 is allowed published by %2", _object, _playername]; if ((typeOf _object) in dayz_allowedObjects) then { - diag_log format ["DEBUG: Object: %1 published by %2 is Safe",_object, _playername]; + //diag_log format ["DEBUG: Object: %1 published by %2 is Safe",_object, _playername]; _allowed = true; }; _allowed @@ -295,7 +295,7 @@ spawn_vehicles = { _index = _weights select _index; _itemType = _itemTypes select _index; _veh addMagazineCargoGlobal [_itemType,1]; - diag_log("DEBUG: spawed loot inside vehicle " + str(_itemType)); + //diag_log("DEBUG: spawed loot inside vehicle " + str(_itemType)); }; [_veh,[_dir,_objPosition],_vehicle,true,"0"] call server_publishVeh; @@ -339,7 +339,7 @@ spawn_roadblocks = { _spawnloot = "DynamicDebrisMilitary"; }; - diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position)); + //diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position)); _veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"]; _veh enableSimulation false; diff --git a/SQF/dayz_server/modules/crash_spawner.sqf b/SQF/dayz_server/modules/crash_spawner.sqf index 5fe99f5d4..cf523bb37 100644 --- a/SQF/dayz_server/modules/crash_spawner.sqf +++ b/SQF/dayz_server/modules/crash_spawner.sqf @@ -24,7 +24,7 @@ if (_spawnRoll <= _spawnChance) then { _position = [getMarkerPos _spawnMarker,0,_spawnRadius,10,0,2000,0] call BIS_fnc_findSafePos; - diag_log(format["CRASHSPAWNER: Spawning '%1' with loot table '%2' NOW! (%3) at: %4", _crashName, _lootTable, time, str(_position)]); + //diag_log(format["CRASHSPAWNER: Spawning '%1' with loot table '%2' NOW! (%3) at: %4", _crashName, _lootTable, time, str(_position)]); _crash = createVehicle [_crashModel,_position, [], 0, "CAN_COLLIDE"]; // Randomize the direction the wreck is facing @@ -80,7 +80,7 @@ if (_spawnRoll <= _spawnChance) then { _index = _weights select _index; _itemType = _itemTypes select _index; [_itemType select 0, _itemType select 1, _position, 5] call spawn_loot; - diag_log(format["CRASHSPAWNER: Loot spawn at '%1' with loot table '%2'", _crashName, _lootTable]); + //diag_log(format["CRASHSPAWNER: Loot spawn at '%1' with loot table '%2'", _crashName, _lootTable]); }; // ReammoBox is preferred parent class here, as WeaponHolder wouldn't match MedBox0 and other such items. diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index f2bb91fa3..4b49de69a 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -124,7 +124,7 @@ if (isServer and isNil "sm_done") then { }; if (_damage < 1) then { - diag_log format["OBJ: %1 - %2", _idKey,_type]; + //diag_log format["OBJ: %1 - %2", _idKey,_type]; //Create it _object = createVehicle [_type, _pos, [], 0, "CAN_COLLIDE"]; @@ -280,7 +280,7 @@ if (isServer and isNil "sm_done") then { _key = format["CHILD:399:%1:",_traderid]; _data = "HiveEXT" callExtension _key; - diag_log "HIVE: Request sent"; + //diag_log "HIVE: Request sent"; //Process result _result = call compile format ["%1",_data]; @@ -289,7 +289,7 @@ if (isServer and isNil "sm_done") then { if (_status == "ObjectStreamStart") then { _val = _result select 1; //Stream Objects - diag_log ("HIVE: Commence Menu Streaming..."); + //diag_log ("HIVE: Commence Menu Streaming..."); call compile format["ServerTcache_%1 = [];",_traderid]; for "_i" from 1 to _val do { _data = "HiveEXT" callExtension _key;