diff --git a/Altis_Life.Altis/briefing.sqf b/Altis_Life.Altis/briefing.sqf
index b478bda63..b6ecc5833 100644
--- a/Altis_Life.Altis/briefing.sqf
+++ b/Altis_Life.Altis/briefing.sqf
@@ -34,9 +34,12 @@ ArmaLife is a GitHub project which aims to update and keep adding new features t
player createDiaryRecord["changelog",
[
- "Altis Life Change Log",
+ "Altis Life Changelog",
"
The official changelog can be found in ArmaLife github. https://git.io/vVkhe
+v4.4 release 3!
+By: danielstuart14
+Date: 31. May 2016
v4.4 release 2!
By: danielstuart14
Date: 20. March 2016
diff --git a/Altis_Life.Altis/core/init.sqf b/Altis_Life.Altis/core/init.sqf
index 2f635568f..c4f5783b1 100644
--- a/Altis_Life.Altis/core/init.sqf
+++ b/Altis_Life.Altis/core/init.sqf
@@ -7,7 +7,7 @@
Master client initialization file
*/
-private["_server_isReady","_extDB_notLoaded"];
+private["_handle","_timeStamp","_server_isReady","_extDB_notLoaded"];
if (life_HC_isActive) then {
_server_isReady = life_HC_server_isReady;
@@ -19,13 +19,13 @@ if (life_HC_isActive) then {
life_firstSpawn = true;
life_session_completed = false;
-private["_handle","_timeStamp"];
0 cutText["Setting up client, please wait...","BLACK FADED"];
0 cutFadeOut 9999999;
_timeStamp = diag_tickTime;
diag_log "----------------------------------------------------------------------------------------------------";
diag_log "--------------------------------- Starting Altis Life Client Init ----------------------------------";
-diag_log "------------------------------------------ Version 4.4R2 -------------------------------------------";
+diag_log "------------------------------------------ Version 4.4R3 -------------------------------------------";
+diag_log "----------------------------------------------------------------------------------------------------";
waitUntil {!isNull player && player == player}; //Wait till the player is ready
[] call compile PreprocessFileLineNumbers "core\clientValidator.sqf";
enableSentences false;
@@ -112,9 +112,6 @@ waitUntil {!(isNull (findDisplay 46))};
diag_log "Display 46 Found";
(findDisplay 46) displayAddEventHandler ["KeyDown", "_this call life_fnc_keyHandler"];
player addRating 99999999;
-diag_log "------------------------------------------------------------------------------------------------------";
-diag_log format[" End of Altis Life Client Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];
-diag_log "------------------------------------------------------------------------------------------------------";
[player,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_managesc",RSERV];
0 cutText ["","BLACK IN"];
@@ -159,3 +156,7 @@ if (life_HC_isActive) then {
} else {
[getPlayerUID player,player getVariable["realname",name player]] remoteExec ["life_fnc_wantedProfUpdate",RSERV];
};
+
+diag_log "----------------------------------------------------------------------------------------------------";
+diag_log format[" End of Altis Life Client Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];
+diag_log "----------------------------------------------------------------------------------------------------";
diff --git a/Altis_Life.Altis/mission.sqm b/Altis_Life.Altis/mission.sqm
index c93af7b62..5a01369a4 100644
--- a/Altis_Life.Altis/mission.sqm
+++ b/Altis_Life.Altis/mission.sqm
@@ -165,7 +165,7 @@ class Mission
{
class Intel
{
- briefingName="Altis Life RPG v4.4r2";
+ briefingName="Altis Life RPG v4.4r3";
overviewText="@STR_MISC_overviewText";
startWeather=0.099999994;
startWind=0.29999998;
diff --git a/life_hc/initHC.sqf b/life_hc/initHC.sqf
index 1985811bc..427a8bb45 100644
--- a/life_hc/initHC.sqf
+++ b/life_hc/initHC.sqf
@@ -6,6 +6,7 @@
Description:
Initialize the headless client.
*/
+private "_timeStamp";
if (EXTDB_SETTING(getNumber,"HeadlessSupport") isEqualTo 0) exitWith {};
[] execVM "\life_hc\KRON_Strings.sqf";
@@ -14,10 +15,6 @@ life_HC_server_extDB_notLoaded = "";
life_save_civilian_position = if (LIFE_SETTINGS(getNumber,"save_civilian_position") isEqualTo 0) then {false} else {true};
-diag_log "-------------------------------------------------------------------------------------------------------------------";
-diag_log "-------------------------------- Starting initialization of 'extDB2-HC' by NANOU ----------------------------------";
-diag_log "-------------------------------------------------------------------------------------------------------------------";
-
if (isNil {uiNamespace getVariable "life_sql_id"}) then {
life_sql_id = round(random(9999));
CONSTVAR(life_sql_id);
@@ -66,6 +63,12 @@ if (life_HC_server_extDB_notLoaded isEqualType []) exitWith {}; //extDB2-HC did
["CALL deleteOldHouses",1] call HC_fnc_asyncCall;
["CALL deleteOldGangs",1] call HC_fnc_asyncCall;
+_timeStamp = diag_tickTime;
+diag_log "----------------------------------------------------------------------------------------------------";
+diag_log "------------------------------------ Starting Altis Life HC Init -----------------------------------";
+diag_log "-------------------------------------------- Version 4.4R3 -----------------------------------------";
+diag_log "----------------------------------------------------------------------------------------------------";
+
[] execFSM "\life_hc\FSM\cleanup.fsm";
[] spawn HC_fnc_cleanup;
@@ -122,10 +125,8 @@ CONSTVAR(HC_MPAllowedFuncs);
life_HC_isActive = true;
publicVariable "life_HC_isActive";
-
-diag_log "---------------------------- HC is Ready --------------------------------";
-diag_log "Published the needed vars over the network, ready for queries to recieve!";
-diag_log "-------------------------------------------------------------------------";
-
life_HC_server_isReady = true;
publicVariable "life_HC_server_isReady";
+diag_log "----------------------------------------------------------------------------------------------------";
+diag_log format[" End of Altis Life HC Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];
+diag_log "----------------------------------------------------------------------------------------------------";
diff --git a/life_server/init.sqf b/life_server/init.sqf
index c9a0fb039..c4801a232 100644
--- a/life_server/init.sqf
+++ b/life_server/init.sqf
@@ -9,6 +9,7 @@
Description:
Initialize the server and required systems.
*/
+private["_dome","_rsb","_timeStamp"];
DB_Async_Active = false;
DB_Async_ExtraLock = false;
life_server_isReady = false;
@@ -66,8 +67,11 @@ if (life_server_extDB_notLoaded isEqualType []) exitWith {};
["CALL deleteOldHouses",1] call DB_fnc_asyncCall;
["CALL deleteOldGangs",1] call DB_fnc_asyncCall;
+_timeStamp = diag_tickTime;
+diag_log "----------------------------------------------------------------------------------------------------";
diag_log "---------------------------------- Starting Altis Life Server Init ---------------------------------";
-diag_log "------------------------------------------ Version 4.4R2 -------------------------------------------";
+diag_log "------------------------------------------ Version 4.4R3 -------------------------------------------";
+diag_log "----------------------------------------------------------------------------------------------------";
if (LIFE_SETTINGS(getNumber,"save_civilian_position_restart") isEqualTo 1) then {
[] spawn {
@@ -159,7 +163,6 @@ publicVariable "TON_fnc_playtime_values_request";
/* Setup the federal reserve building(s) */
-private["_dome","_rsb"];
_dome = nearestObject [[16019.5,16952.9,0],"Land_Dome_Big_F"];
_rsb = nearestObject [[16019.5,16952.9,0],"Land_Research_house_V1_F"];
@@ -184,3 +187,7 @@ life_attachment_point setVectorDirAndUp [[0,1,0], [0,0,1]];
// Sharing the point of attachment with all players.
publicVariable "life_attachment_point";
+
+diag_log "----------------------------------------------------------------------------------------------------";
+diag_log format[" End of Altis Life Server Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];
+diag_log "----------------------------------------------------------------------------------------------------";