Fix switch weapon addAction with nothing in hands

The addAction click was doing an animation without switching when the
player had a primary or melee on back but nothing in hands.

Probably present in vanilla too, will check later.
This commit is contained in:
ebaydayz
2016-08-17 15:26:17 -04:00
parent 879ed7d479
commit 3103195017
3 changed files with 11 additions and 2 deletions

View File

@@ -72,7 +72,6 @@
[FIXED] Fire cleanup diag_log error in server_functions.sqf #1421 @ebaydayz
[FIXED] NearestObjects position error in server_playerSync.sqf #1425 @ebaydayz
[FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
[FIXED] Some counts reverted to forEach. Count loops can not be nested inside other count loops #1491-#1495 @ebaydayz
[FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1. @Uro1
[FIXED] Eating while inside a vehicle did not drop empty can @deadeye2
[FIXED] Zombie loot error when using loot tables in mission file @deadeye2

View File

@@ -14,6 +14,8 @@
#define FIND_MELEE() (1 call dz_fn_switchWeapon_find)
dz_switchWeapon_mutex = Mutex_New();
dz_switchWeapon_time = 0;
dz_switchWeapon_pistolTime = 0;
//0: switch rifle/melee instantly and update gear
//1: switch rifle/melee with animation

View File

@@ -1 +1,9 @@
1 call dz_fn_switchWeapon;
if (primaryWeapon player == "") then {
if (dayz_onBack in MeleeWeapons) then {
4 call dz_fn_switchWeapon; // Melee
} else {
2 call dz_fn_switchWeapon; // Rifle
};
} else {
1 call dz_fn_switchWeapon;
};