Fix ammo refill when switching skins and ...

- allow player to switch with backpack on.
- player_countmagazines now returns backpack magazines with ammo count.
Do with this as you like.
- Make sure dead players do not have to wait the abort (after the 5
seconds).
- Update changelog
This commit is contained in:
icomrade
2014-03-18 15:48:45 -04:00
parent 058519c926
commit ad2642a5f9
8 changed files with 161 additions and 78 deletions

View File

@@ -287,6 +287,40 @@ if (!isDedicated) then {
_control ctrlShow true;
};
};
gearDialog_create = {
private ["_i","_dialog"];
if (!isNull (findDisplay 106)) then {
(findDisplay 106) closeDisplay 0;
};
openMap false;
closeDialog 0;
if (gear_done) then {sleep 0.001;};
player action ["Gear", player];
if (gear_done) then {sleep 0.001;};
_dialog = findDisplay 106;
_i = 0;
while {isNull _dialog} do {//DO NOT CHANGE TO A FOR LOOP!
_i = _i + 1;
_dialog = findDisplay 106;
if (gear_done) then {sleep 0.001;};
if (_i in [100,200,299]) then {
closeDialog 0;
player action ["Gear", player];
};
if (_i > 300) exitWith {};
};
if (gear_done) then {sleep 0.001;};
_dialog = findDisplay 106;
if ((parseNumber(_this select 0)) != 0) then {
ctrlActivate (_dialog displayCtrl 157);
if (gear_done) then {
waitUntil {ctrlShown (_dialog displayCtrl 159)};
sleep 0.001;
};
};
_dialog
};
gear_ui_offMenu = {
private["_control","_parent","_menu"];