Skip to content

Commit 2f93f49

Browse files
Core: v4.4r3.
A3 1.60 fully supported.
1 parent fb149c8 commit 2f93f49

File tree

5 files changed

+31
-19
lines changed

5 files changed

+31
-19
lines changed

Altis_Life.Altis/briefing.sqf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@ ArmaLife is a GitHub project which aims to update and keep adding new features t
3434

3535
player createDiaryRecord["changelog",
3636
[
37-
"Altis Life Change Log",
37+
"Altis Life Changelog",
3838
"
3939
The official changelog can be found in ArmaLife github. https://git.io/vVkhe<br/><br/>
40+
v4.4 release 3!<br/>
41+
By: danielstuart14<br/>
42+
Date: 31. May 2016<br/><br/>
4043
v4.4 release 2!<br/>
4144
By: danielstuart14<br/>
4245
Date: 20. March 2016<br/><br/>

Altis_Life.Altis/core/init.sqf

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Master client initialization file
88
*/
99

10-
private["_server_isReady","_extDB_notLoaded"];
10+
private["_handle","_timeStamp","_server_isReady","_extDB_notLoaded"];
1111

1212
if (life_HC_isActive) then {
1313
_server_isReady = life_HC_server_isReady;
@@ -19,13 +19,13 @@ if (life_HC_isActive) then {
1919

2020
life_firstSpawn = true;
2121
life_session_completed = false;
22-
private["_handle","_timeStamp"];
2322
0 cutText["Setting up client, please wait...","BLACK FADED"];
2423
0 cutFadeOut 9999999;
2524
_timeStamp = diag_tickTime;
2625
diag_log "----------------------------------------------------------------------------------------------------";
2726
diag_log "--------------------------------- Starting Altis Life Client Init ----------------------------------";
28-
diag_log "------------------------------------------ Version 4.4R2 -------------------------------------------";
27+
diag_log "------------------------------------------ Version 4.4R3 -------------------------------------------";
28+
diag_log "----------------------------------------------------------------------------------------------------";
2929
waitUntil {!isNull player && player == player}; //Wait till the player is ready
3030
[] call compile PreprocessFileLineNumbers "core\clientValidator.sqf";
3131
enableSentences false;
@@ -112,9 +112,6 @@ waitUntil {!(isNull (findDisplay 46))};
112112
diag_log "Display 46 Found";
113113
(findDisplay 46) displayAddEventHandler ["KeyDown", "_this call life_fnc_keyHandler"];
114114
player addRating 99999999;
115-
diag_log "------------------------------------------------------------------------------------------------------";
116-
diag_log format[" End of Altis Life Client Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];
117-
diag_log "------------------------------------------------------------------------------------------------------";
118115

119116
[player,life_settings_enableSidechannel,playerSide] remoteExecCall ["TON_fnc_managesc",RSERV];
120117
0 cutText ["","BLACK IN"];
@@ -159,3 +156,7 @@ if (life_HC_isActive) then {
159156
} else {
160157
[getPlayerUID player,player getVariable["realname",name player]] remoteExec ["life_fnc_wantedProfUpdate",RSERV];
161158
};
159+
160+
diag_log "----------------------------------------------------------------------------------------------------";
161+
diag_log format[" End of Altis Life Client Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];
162+
diag_log "----------------------------------------------------------------------------------------------------";

Altis_Life.Altis/mission.sqm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ class Mission
165165
{
166166
class Intel
167167
{
168-
briefingName="Altis Life RPG v4.4r2";
168+
briefingName="Altis Life RPG v4.4r3";
169169
overviewText="@STR_MISC_overviewText";
170170
startWeather=0.099999994;
171171
startWind=0.29999998;

life_hc/initHC.sqf

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
Description:
77
Initialize the headless client.
88
*/
9+
private "_timeStamp";
910
if (EXTDB_SETTING(getNumber,"HeadlessSupport") isEqualTo 0) exitWith {};
1011

1112
[] execVM "\life_hc\KRON_Strings.sqf";
@@ -14,10 +15,6 @@ life_HC_server_extDB_notLoaded = "";
1415

1516
life_save_civilian_position = if (LIFE_SETTINGS(getNumber,"save_civilian_position") isEqualTo 0) then {false} else {true};
1617

17-
diag_log "-------------------------------------------------------------------------------------------------------------------";
18-
diag_log "-------------------------------- Starting initialization of 'extDB2-HC' by NANOU ----------------------------------";
19-
diag_log "-------------------------------------------------------------------------------------------------------------------";
20-
2118
if (isNil {uiNamespace getVariable "life_sql_id"}) then {
2219
life_sql_id = round(random(9999));
2320
CONSTVAR(life_sql_id);
@@ -66,6 +63,12 @@ if (life_HC_server_extDB_notLoaded isEqualType []) exitWith {}; //extDB2-HC did
6663
["CALL deleteOldHouses",1] call HC_fnc_asyncCall;
6764
["CALL deleteOldGangs",1] call HC_fnc_asyncCall;
6865

66+
_timeStamp = diag_tickTime;
67+
diag_log "----------------------------------------------------------------------------------------------------";
68+
diag_log "------------------------------------ Starting Altis Life HC Init -----------------------------------";
69+
diag_log "-------------------------------------------- Version 4.4R3 -----------------------------------------";
70+
diag_log "----------------------------------------------------------------------------------------------------";
71+
6972
[] execFSM "\life_hc\FSM\cleanup.fsm";
7073

7174
[] spawn HC_fnc_cleanup;
@@ -122,10 +125,8 @@ CONSTVAR(HC_MPAllowedFuncs);
122125

123126
life_HC_isActive = true;
124127
publicVariable "life_HC_isActive";
125-
126-
diag_log "---------------------------- HC is Ready --------------------------------";
127-
diag_log "Published the needed vars over the network, ready for queries to recieve!";
128-
diag_log "-------------------------------------------------------------------------";
129-
130128
life_HC_server_isReady = true;
131129
publicVariable "life_HC_server_isReady";
130+
diag_log "----------------------------------------------------------------------------------------------------";
131+
diag_log format[" End of Altis Life HC Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];
132+
diag_log "----------------------------------------------------------------------------------------------------";

life_server/init.sqf

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
Description:
1010
Initialize the server and required systems.
1111
*/
12+
private["_dome","_rsb","_timeStamp"];
1213
DB_Async_Active = false;
1314
DB_Async_ExtraLock = false;
1415
life_server_isReady = false;
@@ -66,8 +67,11 @@ if (life_server_extDB_notLoaded isEqualType []) exitWith {};
6667
["CALL deleteOldHouses",1] call DB_fnc_asyncCall;
6768
["CALL deleteOldGangs",1] call DB_fnc_asyncCall;
6869

70+
_timeStamp = diag_tickTime;
71+
diag_log "----------------------------------------------------------------------------------------------------";
6972
diag_log "---------------------------------- Starting Altis Life Server Init ---------------------------------";
70-
diag_log "------------------------------------------ Version 4.4R2 -------------------------------------------";
73+
diag_log "------------------------------------------ Version 4.4R3 -------------------------------------------";
74+
diag_log "----------------------------------------------------------------------------------------------------";
7175

7276
if (LIFE_SETTINGS(getNumber,"save_civilian_position_restart") isEqualTo 1) then {
7377
[] spawn {
@@ -159,7 +163,6 @@ publicVariable "TON_fnc_playtime_values_request";
159163

160164

161165
/* Setup the federal reserve building(s) */
162-
private["_dome","_rsb"];
163166
_dome = nearestObject [[16019.5,16952.9,0],"Land_Dome_Big_F"];
164167
_rsb = nearestObject [[16019.5,16952.9,0],"Land_Research_house_V1_F"];
165168

@@ -184,3 +187,7 @@ life_attachment_point setVectorDirAndUp [[0,1,0], [0,0,1]];
184187

185188
// Sharing the point of attachment with all players.
186189
publicVariable "life_attachment_point";
190+
191+
diag_log "----------------------------------------------------------------------------------------------------";
192+
diag_log format[" End of Altis Life Server Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];
193+
diag_log "----------------------------------------------------------------------------------------------------";

0 commit comments

Comments
 (0)