Skip to content

Commit 11c56d0

Browse files
blackfischDomT602
andauthored
Refactor Eventhandling (#615)
* handle vehicle switch with eventhandler * style conventions - single file per evh * forgot fn_setupEvh.sqf * remove fn_hudSetup.sqf & fix hud not showing on spawn * Grammar * Grammar v2 * Lowercase for Spyglass Co-authored-by: DomT602 <32492434+DomT602@users.noreply.github.com>
1 parent 3339bb5 commit 11c56d0

11 files changed

Lines changed: 51 additions & 42 deletions

File tree

Altis_Life.Altis/Functions.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,13 @@ class Life_Client_Core {
183183
class fetchDeadGear {};
184184
class fetchVehInfo {};
185185
class isDamaged {};
186+
class getInMan {};
187+
class getOutMan {};
186188
class giveDiff {};
187189
class handleDamage {};
188190
class handleInv {};
189191
class handleItem {};
190192
class hideObj {};
191-
class hudSetup {};
192193
class hudUpdate {};
193194
class inventoryClosed {};
194195
class inventoryOpened {};

Altis_Life.Altis/config/Config_SpyGlass.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ class SpyGlass {
254254
"life_fnc_gangdisbanded_meta","life_fnc_ganginvite","life_fnc_ganginvite_meta","life_fnc_ganginviteplayer","life_fnc_ganginviteplayer_meta","life_fnc_gangkick","life_fnc_gangkick_meta","life_fnc_gangleave","life_fnc_gangleave_meta","life_fnc_gangmenu","life_fnc_gangmenu_meta","life_fnc_gangnewleader","life_fnc_gangnewleader_meta","life_fnc_gangupgrade","life_fnc_gangupgrade_meta",
255255
"life_fnc_gangbankresponse","life_fnc_gangbankresponse_meta","life_fnc_garagelbchange","life_fnc_garagelbchange_meta","life_fnc_garagerefund","life_fnc_garagerefund_meta","life_fnc_gather","life_fnc_gather_meta","life_fnc_getbuildingpositions","life_fnc_getbuildingpositions_meta","life_fnc_getdpmission","life_fnc_getdpmission_meta","life_fnc_givediff","life_fnc_givediff_meta","life_fnc_giveitem",
256256
"life_fnc_giveitem_meta","life_fnc_givemoney","life_fnc_givemoney_meta","life_fnc_gutanimal","life_fnc_gutanimal_meta","life_fnc_handledamage","life_fnc_handledamage_meta","life_fnc_handleinv","life_fnc_handleinv_meta","life_fnc_handleitem","life_fnc_handleitem_meta","life_fnc_healhospital","life_fnc_healhospital_meta","life_fnc_hideobj","life_fnc_hideobj_meta","life_fnc_houseconfig",
257-
"life_fnc_houseconfig_meta","life_fnc_housemenu","life_fnc_housemenu_meta","life_fnc_hudsetup","life_fnc_hudsetup_meta","life_fnc_hudupdate","life_fnc_hudupdate_meta","life_fnc_impoundaction","life_fnc_impoundaction_meta","life_fnc_impoundmenu","life_fnc_impoundmenu_meta","life_fnc_initciv","life_fnc_initciv_meta","life_fnc_initcop","life_fnc_initcop_meta","life_fnc_initgang",
257+
"life_fnc_houseconfig_meta","life_fnc_housemenu","life_fnc_housemenu_meta","life_fnc_hudupdate","life_fnc_hudupdate_meta","life_fnc_impoundaction","life_fnc_impoundaction_meta","life_fnc_impoundmenu","life_fnc_impoundmenu_meta","life_fnc_initciv","life_fnc_initciv_meta","life_fnc_initcop","life_fnc_initcop_meta","life_fnc_initgang",
258258
"life_fnc_initgang_meta","life_fnc_inithouses","life_fnc_inithouses_meta","life_fnc_initmedic","life_fnc_initmedic_meta","life_fnc_inventoryclosed","life_fnc_inventoryclosed_meta","life_fnc_inventoryopened","life_fnc_inventoryopened_meta","life_fnc_isdamaged","life_fnc_isdamaged_meta","life_fnc_isnumeric","life_fnc_isnumeric_meta","life_fnc_isuidactive","life_fnc_isuidactive_meta",
259259
"life_fnc_itemweight","life_fnc_itemweight_meta","life_fnc_jail","life_fnc_jail_meta","life_fnc_jailme","life_fnc_jailme_meta","life_fnc_jailsys","life_fnc_jailsys_meta","life_fnc_jerrycanrefuel","life_fnc_jerrycanrefuel_meta","life_fnc_jerryrefuel","life_fnc_jerryrefuel_meta","life_fnc_jumpfnc","life_fnc_jumpfnc_meta","life_fnc_keydrop","life_fnc_keydrop_meta","life_fnc_keygive",
260260
"life_fnc_keygive_meta","life_fnc_keyhandler","life_fnc_keyhandler_meta","life_fnc_keymenu","life_fnc_keymenu_meta","life_fnc_knockedout","life_fnc_knockedout_meta","life_fnc_knockoutaction","life_fnc_knockoutaction_meta","life_fnc_levelcheck","life_fnc_levelcheck_meta","life_fnc_licensecheck","life_fnc_licensecheck_meta","life_fnc_licensesread","life_fnc_licensesread_meta","life_fnc_lighthouse",
@@ -281,7 +281,7 @@ class SpyGlass {
281281
"life_fnc_vehtakeitem","life_fnc_vehtakeitem_meta","life_fnc_vinteractionmenu","life_fnc_vinteractionmenu_meta","life_fnc_virt_buy","life_fnc_virt_buy_meta","life_fnc_virt_menu","life_fnc_virt_menu_meta","life_fnc_virt_sell","life_fnc_virt_sell_meta","life_fnc_virt_update","life_fnc_virt_update_meta","life_fnc_wantedadd","life_fnc_wantedadd_meta","life_fnc_wantedaddp","life_fnc_wantedaddp_meta",
282282
"life_fnc_wantedbounty","life_fnc_wantedbounty_meta","life_fnc_wantedfetch","life_fnc_wantedfetch_meta","life_fnc_wantedgrab","life_fnc_wantedgrab_meta","life_fnc_wantedinfo","life_fnc_wantedinfo_meta","life_fnc_wantedlist","life_fnc_wantedlist_meta","life_fnc_wantedmenu","life_fnc_wantedmenu_meta","life_fnc_wantedperson","life_fnc_wantedperson_meta","life_fnc_wantedpunish","life_fnc_wantedpunish_meta",
283283
"life_fnc_wantedremove","life_fnc_wantedremove_meta","life_fnc_wantedticket","life_fnc_wantedticket_meta","life_fnc_weaponshopaccs","life_fnc_weaponshopaccs_meta","life_fnc_weaponshopbuysell","life_fnc_weaponshopbuysell_meta","life_fnc_weaponshopcfg","life_fnc_weaponshopcfg_meta","life_fnc_weaponshopfilter","life_fnc_weaponshopfilter_meta","life_fnc_weaponshopmags","life_fnc_weaponshopmags_meta",
284-
"life_fnc_weaponshopmenu","life_fnc_weaponshopmenu_meta","life_fnc_weaponshopselection","life_fnc_weaponshopselection_meta","life_fnc_welcomenotification","life_fnc_welcomenotification_meta","life_fnc_whereami","life_fnc_whereami_meta","life_fnc_wiretransfer","life_fnc_wiretransfer_meta"
284+
"life_fnc_weaponshopmenu","life_fnc_weaponshopmenu_meta","life_fnc_weaponshopselection","life_fnc_weaponshopselection_meta","life_fnc_welcomenotification","life_fnc_welcomenotification_meta","life_fnc_whereami","life_fnc_whereami_meta","life_fnc_wiretransfer","life_fnc_wiretransfer_meta","life_fnc_getinman", "life_fnc_getinman_meta","life_fnc_getoutman", "life_fnc_getoutman_meta"
285285
};
286286

287287
SERVER_Functions[] = {

Altis_Life.Altis/core/fn_setupEVH.sqf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ player addEventHandler ["InventoryClosed", {_this call life_fnc_inventoryClosed}
1414
player addEventHandler ["InventoryOpened", {_this call life_fnc_inventoryOpened}];
1515
player addEventHandler ["HandleRating", {0}];
1616

17+
player addEventHandler ["GetInMan", {_this call life_fnc_getInMan}];
18+
player addEventHandler ["GetOutMan", {_this call life_fnc_getOutMan}];
19+
1720
addMissionEventHandler ["Map", {_this call life_fnc_checkMap}];
1821

19-
[missionNamespace,"OnGameInterrupt",{_this call life_fnc_onGameInterrupt}] call BIS_fnc_addScriptedEventHandler;
22+
[missionNamespace,"OnGameInterrupt",{_this call life_fnc_onGameInterrupt}] call BIS_fnc_addScriptedEventHandler;

Altis_Life.Altis/core/fn_survival.sqf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ _walkDis = 0;
7070
_bp = "";
7171
_lastPos = visiblePosition player;
7272
_lastPos = (_lastPos select 0) + (_lastPos select 1);
73-
_lastState = vehicle player;
7473

7574
for "_i" from 0 to 1 step 0 do {
7675
/* Thirst / Hunger adjustment that is time based */
@@ -89,12 +88,6 @@ for "_i" from 0 to 1 step 0 do {
8988
};
9089
};
9190

92-
/* Check if the player's state changed? */
93-
if (!(vehicle player isEqualTo _lastState) || {!alive player}) then {
94-
[] call life_fnc_updateViewDistance;
95-
_lastState = vehicle player;
96-
};
97-
9891
/* Check if the weight has changed and the player is carrying to much */
9992
if (life_carryWeight > life_maxWeight && {!isForcedWalk player} && {!life_god}) then {
10093
player forceWalk true;
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
File: fn_getInMan.sqf
3+
Author: blackfisch
4+
5+
Description:
6+
Handles player entering a vehicle.
7+
*/
8+
params [
9+
["_unit", objNull, [objNull]],
10+
["_role", "", [""]],
11+
["_vehicle", objNull, [objNull]],
12+
["_turret", [], [[]]]
13+
];
14+
15+
//update view distance settings
16+
[] call life_fnc_updateViewDistance;
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
File: fn_getOutMan.sqf
3+
Author: blackfisch
4+
5+
Description:
6+
Handles player leaving a vehicle.
7+
*/
8+
params [
9+
["_unit", objNull, [objNull]],
10+
["_role", "", [""]],
11+
["_vehicle", objNull, [objNull]],
12+
["_turret", [], [[]]]
13+
];
14+
15+
//update view distance settings
16+
[] call life_fnc_updateViewDistance;

Altis_Life.Altis/core/functions/fn_hudSetup.sqf

Lines changed: 0 additions & 22 deletions
This file was deleted.

Altis_Life.Altis/core/functions/fn_hudUpdate.sqf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
*/
99
disableSerialization;
1010

11-
if (isNull LIFEdisplay) then {[] call life_fnc_hudSetup;};
11+
if (isNull LIFEdisplay) then {
12+
cutRsc ["playerHUD", "PLAIN", 2, false];
13+
};
1214
LIFEctrl(2200) progressSetPosition (life_hunger / 100);
1315
LIFEctrl(2201) progressSetPosition (1 - (damage player));
1416
LIFEctrl(2202) progressSetPosition (life_thirst / 100);

Altis_Life.Altis/core/init.sqf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ diag_log "[Life Client] Past Settings Init";
7272
(findDisplay 46) displayAddEventHandler ["KeyDown", "_this call life_fnc_keyHandler"];
7373
[player, life_settings_enableSidechannel, playerSide] remoteExecCall ["TON_fnc_manageSC", RSERV];
7474

75-
[] call life_fnc_hudSetup;
7675
[] spawn life_fnc_survival;
7776

7877
0 cutText ["","BLACK IN"];
@@ -109,6 +108,8 @@ if (life_HC_isActive) then {
109108
[getPlayerUID player, player getVariable ["realname", name player]] remoteExec ["life_fnc_wantedProfUpdate", RSERV];
110109
};
111110

111+
[] call life_fnc_hudUpdate;
112+
112113
diag_log "----------------------------------------------------------------------------------------------------";
113114
diag_log format [" End of Altis Life Client Init :: Total Execution Time %1 seconds ",(diag_tickTime - _timeStamp)];
114115
diag_log "----------------------------------------------------------------------------------------------------";

Altis_Life.Altis/dialog/function/fn_spawnConfirm.sqf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,3 @@ if (life_firstSpawn) then {
6060
[] call life_fnc_welcomeNotification;
6161
};
6262
[] call life_fnc_playerSkins;
63-
[] call life_fnc_hudSetup;

0 commit comments

Comments
 (0)