From 796f5008b6d7a39386094e602b9aca2831fa10b0 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 25 Nov 2013 15:57:57 -0600 Subject: [PATCH] cleanup and move road debris back to server --- SQF/dayz_code/system/player_monitor.fsm | 2 +- SQF/dayz_server/compile/server_playerSetup.sqf | 9 ++------- SQF/dayz_server/init/server_functions.sqf | 16 ++++++++-------- SQF/dayz_server/system/server_monitor.sqf | 2 +- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 3381c9a3c..151abb597 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -1031,7 +1031,7 @@ class FSM "selectNoPlayer;" \n "_myTime = diag_tickTime;" \n "" \n - "dayz_loadScreenMsg = ""You are running an incorrect version of DAYZ_CODE, please download this file from dayzepoch.com."";" \n + "dayz_loadScreenMsg = ""You are running an incorrect version, please download update from dayzepoch.com."";" \n "" \n "1 cutText [format[localize ""str_player_18"",dayz_versionNo,_version], ""PLAIN""];" \n "" \n diff --git a/SQF/dayz_server/compile/server_playerSetup.sqf b/SQF/dayz_server/compile/server_playerSetup.sqf index f8bcd3b3b..04b9de77f 100644 --- a/SQF/dayz_server/compile/server_playerSetup.sqf +++ b/SQF/dayz_server/compile/server_playerSetup.sqf @@ -235,20 +235,15 @@ _playerObj setVariable["lastPos",getPosATL _playerObj]; dayzPlayerLogin2 = [_worldspace,_state,_randomSpot]; -// PVDZE_plr_SetWeather,PVDZE_plr_SetDate - -PVDZE_obj_Debris = DZE_LocalRoadBlocks; +// PVDZE_obj_Debris = DZE_LocalRoadBlocks; _clientID = owner _playerObj; if (!isNull _playerObj) then { _clientID publicVariableClient "dayzPlayerLogin2"; // send road blocks - _clientID publicVariableClient "PVDZE_obj_Debris"; + // _clientID publicVariableClient "PVDZE_obj_Debris"; _clientID publicVariableClient "PVDZE_plr_SetDate"; - - _clientID publicVariableClient "PVDZE_plr_SetWeather"; - }; //record time started _playerObj setVariable ["lastTime",time]; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index e018cb16d..81e394d81 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -414,18 +414,18 @@ spawn_roadblocks = { }; // fill array with classes and positions [class,pos,dir] - DZE_LocalRoadBlocks set [count DZE_LocalRoadBlocks,[_spawnveh,_position,round(random 360)]]; + // DZE_LocalRoadBlocks set [count DZE_LocalRoadBlocks,[_spawnveh,_position,round(random 360)]]; //diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position)); - //_veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"]; - //_veh enableSimulation false; + _veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"]; + _veh enableSimulation false; // Randomize placement a bit - //_veh setDir round(random 360); - //_veh setpos _position; + _veh setDir round(random 360); + _veh setpos _position; - //_veh setVariable ["ObjectID","1",true]; + _veh setVariable ["ObjectID","1",true]; }; }; @@ -503,9 +503,9 @@ if(isnil "DZE_DiagVerbose") then { dze_diag_fps = { if(DZE_DiagVerbose) then { - diag_log format["DEBUG FPS : %1 OBJECTS: %2 : PLAYERS: %3", DZE_diag_fps,(count (allMissionObjects "")),(playersNumber west)]; + diag_log format["DEBUG FPS : %1 OBJECTS: %2 : PLAYERS: %3", diag_fps,(count (allMissionObjects "")),(playersNumber west)]; } else { - diag_log format["DEBUG FPS : %1", DZE_diag_fps]; + diag_log format["DEBUG FPS : %1", diag_fps]; }; }; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 142d02909..9183e1082 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -299,7 +299,7 @@ if (isServer and isNil "sm_done") then { // spawn_roadblocks diag_log ("HIVE: Spawning # of Debris: " + str(MaxDynamicDebris)); for "_x" from 1 to MaxDynamicDebris do { - [] call spawn_roadblocks; + [] spawn spawn_roadblocks; }; // spawn_ammosupply at server start 1% of roadblocks diag_log ("HIVE: Spawning # of Ammo Boxes: " + str(MaxAmmoBoxes));