From 5afebfe39726c359813916157da3a55a7967673c Mon Sep 17 00:00:00 2001 From: Abdurrahmaan Iqbal Date: Tue, 15 Oct 2019 22:11:39 +0100 Subject: [PATCH] Enable dryfire --- Sources/Client/Client_Update.cpp | 5 ----- Sources/Client/Weapon.cpp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Sources/Client/Client_Update.cpp b/Sources/Client/Client_Update.cpp index fd97b7990..e1b73cd43 100644 --- a/Sources/Client/Client_Update.cpp +++ b/Sources/Client/Client_Update.cpp @@ -426,11 +426,6 @@ namespace spades { winp.primary = false; winp.secondary = false; } - - // stop firing if the player is out of ammo - if (player->GetWeapon()->GetAmmo() == 0) { - winp.primary = false; - } } player->SetInput(inp); diff --git a/Sources/Client/Weapon.cpp b/Sources/Client/Weapon.cpp index 7e29533b1..31f20e6e3 100644 --- a/Sources/Client/Weapon.cpp +++ b/Sources/Client/Weapon.cpp @@ -97,7 +97,7 @@ namespace spades { world->GetListener()->PlayerFiredWeapon(owner); } nextShotTime += GetDelay(); - } else if (time >= nextShotTime) { + } else { dryFire = true; } shootingPreviously = true;