1
This commit is contained in:
parent
c4aa0c1a97
commit
e0561d5bfd
@ -2046,6 +2046,16 @@ void Creature::SetCurrWeapon(Weapon* weapon)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (curr_weapon_ != weapon) {
|
if (curr_weapon_ != weapon) {
|
||||||
|
if (GetActionType() == AT_Reload) {
|
||||||
|
CancelAction();
|
||||||
|
if (weapon->weapon_idx != 0 &&
|
||||||
|
weapon->ammo <= 0) {
|
||||||
|
if (weapon->weapon_idx == GUN_SLOT1 |
|
||||||
|
weapon->weapon_idx == GUN_SLOT2) {
|
||||||
|
AutoLoadingBullet();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
GetTrigger()->TakeonWeapon(curr_weapon_, weapon);
|
GetTrigger()->TakeonWeapon(curr_weapon_, weapon);
|
||||||
}
|
}
|
||||||
curr_weapon_ = weapon;
|
curr_weapon_ = weapon;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user