Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugs fix #738

Open
wants to merge 2 commits into
base: v5.X.X
Choose a base branch
from
Open

Bugs fix #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aef189
Fix store/take items in vehicle while inUse
Nov 11, 2020
437ef17
Fix _vehicleColor in garage if color doesn't exist anymore
Maxence1502 Nov 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Altis_Life.Altis/core/vehicle/fn_vehStoreItem.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
private ["_ctrl","_num","_totalWeight","_itemWeight","_veh_data","_inv","_index","_val"];
disableSerialization;
if ((life_trunk_vehicle getVariable ["trunk_in_use_by",player]) != player) exitWith { closeDialog 0; hint localize "STR_MISC_VehInvUse"; };
if (life_action_inUse) exitWith {closeDialog 0;}; // How did he opened the dialog ?!

_ctrl = ctrlSelData(3503);
_num = ctrlText 3506;
Expand Down
1 change: 1 addition & 0 deletions Altis_Life.Altis/core/vehicle/fn_vehTakeItem.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ disableSerialization;
if (isNull life_trunk_vehicle || !alive life_trunk_vehicle) exitWith {hint localize "STR_MISC_VehDoesntExist"};
if (!alive player) exitWith {closeDialog 0;};
if ((life_trunk_vehicle getVariable ["trunk_in_use_by",player]) != player) exitWith { closeDialog 0; hint localize "STR_MISC_VehInvUse"; };
if (life_action_inUse) exitWith {closeDialog 0;}; // How did he opened the dialog ?!

if ((lbCurSel 3502) isEqualTo -1) exitWith {hint localize "STR_Global_NoSelection";};
_ctrl = ctrlSelData(3502);
Expand Down
8 changes: 7 additions & 1 deletion Altis_Life.Altis/dialog/function/fn_garageLBChange.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ if (!isClass (missionConfigFile >> "LifeCfgVehicles" >> _classNameLife)) then {
diag_log format ["%1: LifeCfgVehicles class doesn't exist",_className];
};

_vehicleColor = ((M_CONFIG(getArray,"LifeCfgVehicles",_classNameLife,"textures") select (_dataArr select 1)) select 0);
_colorsArray = M_CONFIG(getArray,"LifeCfgVehicles",_classNameLife,"textures");
_selectedColor = (_dataArr select 1);

if (((count _colorsArray) - 1) >= _selectedColor) then {
_vehicleColor = ((_colorsArray select _selectedColor) select 0);
};

if (isNil "_vehicleColor") then {_vehicleColor = "Default";};

_vehicleInfo = [_className] call life_fnc_fetchVehInfo;
Expand Down