Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for null player

Browse Source
This commit is contained in:
commy2 2016-05-14 20:33:33 +02:00
parent 7628f9a4ab
commit 07caf1b0bd
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/common/XEH_postInit.sqf
View File

@ -389,18 +389,25 @@ GVAR(OldIsCamera) = false;
// we don't want to trigger this just because your ammo counter decreased.
_data = + GVAR(OldPlayerInventory);
if (!((_data select 0) isEqualTo [])) then {
(_data param [0, []]) set [4, primaryWeaponMagazine ACE_player];
(_data param [0, []]) set [5, []];
private _weaponInfo = _data param [0, []];
if !(_weaponInfo isEqualTo []) then {
_weaponInfo set [4, primaryWeaponMagazine ACE_player];
_weaponInfo deleteAt 5;
};
if (!((_data select 1) isEqualTo [])) then {
(_data param [1, []]) set [4, secondaryWeaponMagazine ACE_player];
(_data param [1, []]) set [5, []];
_weaponInfo = _data param [1, []];
if !(_weaponInfo isEqualTo []) then {
_weaponInfo set [4, secondaryWeaponMagazine ACE_player];
_weaponInfo deleteAt 5;
};
if (!((_data select 2) isEqualTo [])) then {
(_data param [2, []]) set [4, handgunMagazine ACE_player];
(_data param [2, []]) set [5, []];
_weaponInfo = _data param [2, []];
if !(_weaponInfo isEqualTo []) then {
_weaponInfo set [4, handgunMagazine ACE_player];
_weaponInfo deleteAt 5;
};
if !(_data isEqualTo GVAR(OldPlayerInventoryNoAmmo)) then {
GVAR(OldPlayerInventoryNoAmmo) = _data;
["playerInventoryChanged", [ACE_player, GVAR(OldPlayerInventory)]] call FUNC(localEvent);

2
addons/medical/functions/fnc_reviveStateLoop.sqf
View File

@ -13,7 +13,7 @@
#include "script_component.hpp"
params ["_unit"]
params ["_unit"];
// If locality changed finish the local loop
// @todo: reinitiate the loop elsewhere