Shared: Reset shotcounters cleanly when weapons are finished reloading.

2023-07-11 13:35:18 -07:00 · 2023-07-11 13:35:18 -07:00 · be6fd77592
parent d6045d04f2
commit be6fd77592
40 changed files with 148 additions and 76 deletions
--- a/src/server/armoury_entity.qc
+++ b/src/server/armoury_entity.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED armoury_entity (0 0 0.8) (-16 -16 0) (16 16 16)
+/*!QUAKED armoury_entity (0 0 0.8) (-16 -16 0) (16 16 16)
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
--- a/src/server/func_bomb_target.qc
+++ b/src/server/func_bomb_target.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED func_bomb_target (0 .5 .8) ?
+/*!QUAKED func_bomb_target (0 .5 .8) ?
 "targetname"    Name
 "target"        Target when bomb blows up.
 "killtarget"    Target to kill when triggered.
--- a/src/server/func_buyzone.qc
+++ b/src/server/func_buyzone.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED func_buyzone (0 .5 .8) ?
+/*!QUAKED func_buyzone (0 .5 .8) ?
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
--- a/src/server/func_escapezone.qc
+++ b/src/server/func_escapezone.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED func_escapezone (0 .5 .8) ?
+/*!QUAKED func_escapezone (0 .5 .8) ?
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
--- a/src/server/func_hostage_rescue.qc
+++ b/src/server/func_hostage_rescue.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED func_hostage_rescue (0 .5 .8) ?
+/*!QUAKED func_hostage_rescue (0 .5 .8) ?
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
--- a/src/server/func_vip_safetyzone.qc
+++ b/src/server/func_vip_safetyzone.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED func_vip_safetyzone (0 .5 .8) ?
+/*!QUAKED func_vip_safetyzone (0 .5 .8) ?
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
--- a/src/server/hostage_entity.qc
+++ b/src/server/hostage_entity.qc
@ -14,19 +14,22 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED hostage_entity (0 1 0) (-16 -16 0) (16 16 72)
+/*!QUAKED hostage_entity (0 1 0) (-16 -16 0) (16 16 72)
+# OVERVIEW
+Hostage NPC.
+Used in the Hostage Rescue mode (cs_* maps).
+
+# KEYS
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
-"model"         "models/hostage.mdl"
-"skin"          "0"

-COUNTER-STRIKE (1999) ENTITY
-
-Hostage NPC.
-
-Used in the Hostage Rescue mode (cs_* maps).
+# TRIVIA
+This entity was introduced in Counter-Strike (1999)

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/hostage.mdl"
+skin="0"
 */

 enum
--- a/src/server/info_buyzone.qc
+++ b/src/server/info_buyzone.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED info_buyzone (0 0 0.8) (-16 -16 0) (16 16 16)
+/*!QUAKED info_buyzone (0 0 0.8) (-16 -16 0) (16 16 16)
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
@ -28,10 +28,10 @@ See func_buyzone for more information.
 class
 info_buyzone:NSPointTrigger
 {
-	void(void) info_buyzone;
+	void info_buyzone(void);

-	virtual void(void) Respawn;
-	virtual void(entity) Touch;
+	virtual void Respawn(void);
+	virtual void Touch(entity);
 };

 void
--- a/src/server/info_hostage_rescue.qc
+++ b/src/server/info_hostage_rescue.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED info_hostage_rescue (0 0 0.8) (-16 -16 0) (16 16 16)
+/*!QUAKED info_hostage_rescue (0 0 0.8) (-16 -16 0) (16 16 16)
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
--- a/src/server/info_map_parameters.qc
+++ b/src/server/info_map_parameters.qc
@ -14,7 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED info_map_parameters (0 0 0.8) (-16 -16 0) (16 16 16)
+/*!QUAKED info_map_parameters (0 0 0.8) (-16 -16 0) (16 16 16)
 "targetname"    Name
 "target"        Target when triggered.
 "killtarget"    Target to kill when triggered.
--- a/src/shared/w_ak47.qc
+++ b/src/shared/w_ak47.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_ak47 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_ak47.mdl"
+/*!QUAKED weapon_ak47 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -25,6 +24,8 @@ AK-47 Weapon
 Price: $2500
 Terrorists only weapon

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_ak47.mdl"
 */

 #ifdef CLIENT
@ -215,6 +216,7 @@ w_ak47_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::ak47_mag, player::ammo_762mm, 30);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_aug.qc
+++ b/src/shared/w_aug.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_aug (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_aug.mdl"
+/*!QUAKED weapon_aug (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -25,6 +24,8 @@ Steyr AUG Weapon
 Price: $3500
 Counter-Terrorists only weapon

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_aug.mdl"
 */

 enum
@ -198,6 +199,7 @@ w_aug_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::aug_mag, player::ammo_762mm, 30);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_awp.qc
+++ b/src/shared/w_awp.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_awp (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_awp.mdl"
+/*!QUAKED weapon_awp (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ AWP (AI Arctic Warfare/Magnum) Weapon
 - Buy Menu -
 Price: $4750

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_awp.mdl"
 */

 #ifdef CLIENT
@ -267,6 +268,7 @@ w_awp_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::awp_mag, player::ammo_338mag, 10);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_c4bomb.qc
+++ b/src/shared/w_c4bomb.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_c4bomb (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_c4.mdl"
+/*!QUAKED weapon_c4bomb (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -26,6 +25,8 @@ Default arsenal for Terrorists
 Can only be picked up by Terrorists and planted in
 func_bombtarget brush entities.

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_c4.mdl"
 */

 /* C4 weapon logic */
--- a/src/shared/w_deagle.qc
+++ b/src/shared/w_deagle.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_deagle (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_deagle.mdl"
+/*!QUAKED weapon_deagle (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Desert Eagle .50 AE Weapon
 - Buy Menu -
 Price: $650

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_deagle.mdl"
 */

 #ifdef CLIENT
@ -214,6 +215,7 @@ w_deagle_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::deagle_mag, player::ammo_50ae, 7);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_elites.qc
+++ b/src/shared/w_elites.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_elites (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_elite.mdl"
+/*!QUAKED weapon_elites (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Dual Beretta 96G (Elites) Weapon
 - Buy Menu -
 Price: $1000

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_elite.mdl"
 */

 #ifdef CLIENT
@ -283,6 +284,7 @@ w_elites_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::elites_mag, player::ammo_9mm, 30);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_fiveseven.qc
+++ b/src/shared/w_fiveseven.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_fiveseven (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_fiveseven.mdl"
+/*!QUAKED weapon_fiveseven (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Five-SeveN Weapon
 - Buy Menu -
 Price: $750

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_fiveseven.mdl"
 */

 enum
@ -182,6 +183,7 @@ w_fiveseven_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::fiveseven_mag, player::ammo_57mm, 20);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_flashbang.qc
+++ b/src/shared/w_flashbang.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_flashbang (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_flashbang.mdl"
+/*!QUAKED weapon_flashbang (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -26,6 +25,8 @@ When thrown, nearby players become blinded temporarily from the blast.
 - Buy Menu -
 Price: $200

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_flashbang.mdl"
 */

 enum
@ -162,6 +163,9 @@ w_flashbang_primary(player pl)

 	/* Ammo check */
 	if (pl.ammo_fbgrenade <= 0) {
+#ifdef SERVER
+		Weapons_RemoveItem(pl, WEAPON_FLASHBANG);
+#endif
 		return;
 	}

--- a/src/shared/w_g3sg1.qc
+++ b/src/shared/w_g3sg1.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_g3sg1 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_g3sg1.mdl"
+/*!QUAKED weapon_g3sg1 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,7 +23,8 @@ Heckler & Koch G3/SG-1 Weapon
 - Buy Menu -
 Price: $5000

-*/
+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_g3sg1.mdl"*/

 enum
 {
@ -188,7 +188,8 @@ w_g3sg1_reload(player pl)
 #ifdef SERVER
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
-	Weapons_ReloadWeapon(pl, player::g3sg1_mag, player::ammo_762mm, 20);
+		Weapons_ReloadWeapon(pl, player::g3sg1_mag, player::ammo_762mm, 20);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_glock18.qc
+++ b/src/shared/w_glock18.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_glock18 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_glock18.mdl"
+/*!QUAKED weapon_glock18 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -26,6 +25,8 @@ Default arsenal for Terrorists
 - Buy Menu -
 Price: $400

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_glock18.mdl"
 */

 enum
@ -248,6 +249,7 @@ w_glock18_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::glock18_mag, player::ammo_9mm, 20);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_hegrenade.qc
+++ b/src/shared/w_hegrenade.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_hegrenade (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_hegrenade.mdl"
+/*!QUAKED weapon_hegrenade (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -26,6 +25,8 @@ When thrown, explodes with a fairly deadly blast radius to players.
 - Buy Menu -
 Price: $300

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_hegrenade.mdl"
 */

 enum
@ -164,6 +165,9 @@ w_hegrenade_primary(player pl)

 	/* Ammo check */
 	if (pl.ammo_hegrenade <= 0) {
+#ifdef SERVER
+		Weapons_RemoveItem(pl, WEAPON_HEGRENADE);
+#endif
 		return;
 	}

--- a/src/shared/w_knife.qc
+++ b/src/shared/w_knife.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_knife (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_knife.mdl"
+/*!QUAKED weapon_knife (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -23,6 +22,8 @@ Knife Weapon

 Default arsenal on both teams

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_knife.mdl"
 */

 enum
--- a/src/shared/w_m3.qc
+++ b/src/shared/w_m3.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_m3 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_m3.mdl"
+/*!QUAKED weapon_m3 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Benneli M3 Super90 Weapon
 - Buy Menu -
 Price: $1700

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_m3.mdl"
 */

 #ifdef CLIENT
--- a/src/shared/w_m4a1.qc
+++ b/src/shared/w_m4a1.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_m4a1 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_m4a1.mdl"
+/*!QUAKED weapon_m4a1 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -25,6 +24,8 @@ Colt M4A1 Carbine Weapon
 Price: $3100
 Counter-Terrorists only weapon

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_m4a1.mdl"
 */

 enum
@ -245,6 +246,7 @@ w_m4a1_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::m4a1_mag, player::ammo_556mm, 30);
+		Cstrike_ShotReset(pl);
 	}
 	
 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_mac10.qc
+++ b/src/shared/w_mac10.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_mac10 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_mac10.mdl"
+/*!QUAKED weapon_mac10 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Ingram MAC-10 Weapon
 - Buy Menu -
 Price: $1400

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_mac10.mdl"
 */

 enum
@ -177,6 +178,7 @@ w_mac10_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::mac10_mag, player::ammo_45acp, 30);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_mp5.qc
+++ b/src/shared/w_mp5.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_mp5navy (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_mp5.mdl"
+/*!QUAKED weapon_mp5navy (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Heckler & Koch MP5-Navy Weapon
 - Buy Menu -
 Price: $1500

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_mp5.mdl"
 */

 enum
@ -175,6 +176,7 @@ w_mp5_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::mp5_mag, player::ammo_9mm, 30);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_p228.qc
+++ b/src/shared/w_p228.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_ (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_p228.mdl"
+/*!QUAKED weapon_p228 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ SIG P228 Weapon
 - Buy Menu -
 Price: $600

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_p228.mdl"
 */

 enum
@ -183,6 +184,7 @@ w_p228_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::p228_mag, player::ammo_357sig, 13);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_p90.qc
+++ b/src/shared/w_p90.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_p90 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_p90.mdl"
+/*!QUAKED weapon_p90 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ FN P90 Weapon
 - Buy Menu -
 Price: $2350

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_p90.mdl"
 */

 enum
@ -175,6 +176,7 @@ w_p90_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::p90_mag, player::ammo_57mm, 50);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_para.qc
+++ b/src/shared/w_para.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_m249 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_m249.mdl"
+/*!QUAKED weapon_m249 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ FN M249 Para Weapon
 - Buy Menu -
 Price: $5750

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_m249.mdl"
 */

 enum
@ -168,6 +169,7 @@ w_para_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::para_mag, player::ammo_556mmbox, 100);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_scout.qc
+++ b/src/shared/w_scout.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_scout (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_scout.mdl"
+/*!QUAKED weapon_scout (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Steyr Scout Weapon
 - Buy Menu -
 Price: $1250

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_scout.mdl"
 */

 enum
@ -228,6 +229,7 @@ w_scout_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::scout_mag, player::ammo_762mm, 10);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_sg550.qc
+++ b/src/shared/w_sg550.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_sg550 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_sg550.mdl"
+/*!QUAKED weapon_sg550 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ SIG SG 550 Weapon
 - Buy Menu -
 Price: $4200

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_sg550.mdl"
 */

 enum
@ -191,6 +192,7 @@ w_sg550_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::sg550_mag, player::ammo_556mm, 30);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_sg552.qc
+++ b/src/shared/w_sg552.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_sg552 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_sg552.mdl"
+/*!QUAKED weapon_sg552 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ SIG SG 552 Commando Weapon
 - Buy Menu -
 Price: $3500

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_sg552.mdl"
 */

 enum
@ -195,6 +196,7 @@ w_sg552_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::sg552_mag, player::ammo_556mm, 30);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_smokegrenade.qc
+++ b/src/shared/w_smokegrenade.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_smokegrenade (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_smokegrenade.mdl"
+/*!QUAKED weapon_smokegrenade (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -26,6 +25,8 @@ When thrown, the explosion casts view-blocking smoke in that radius.
 - Buy Menu -
 Price: $300

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_smokegrenade.mdl"
 */

 enum
@ -162,6 +163,9 @@ w_smokegrenade_primary(player pl)

 	/* Ammo check */
 	if (pl.ammo_smokegrenade <= 0) {
+#ifdef SERVER
+		Weapons_RemoveItem(pl, WEAPON_SMOKEGRENADE);
+#endif
 		return;
 	}

--- a/src/shared/w_tmp.qc
+++ b/src/shared/w_tmp.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_tmp (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_tmp.mdl"
+/*!QUAKED weapon_tmp (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Steyr Tactical Weapon
 - Buy Menu -
 Price: $1250

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_tmp.mdl"
 */

 enum
@ -175,6 +176,7 @@ w_tmp_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::tmp_mag, player::ammo_9mm, 30);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_ump45.qc
+++ b/src/shared/w_ump45.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_ump45 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_ump45.mdl"
+/*!QUAKED weapon_ump45 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Heckler & Koch UMP .45 ACP Weapon
 - Buy Menu -
 Price: $1700

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_ump45.mdl"
 */

 enum
@ -174,6 +175,7 @@ w_ump45_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::ump45_mag, player::ammo_45acp, 25);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_usp45.qc
+++ b/src/shared/w_usp45.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_usp45 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_usp45.mdl"
+/*!QUAKED weapon_usp45 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -26,6 +25,8 @@ Default arsenal for Counter-Terrorists
 - Buy Menu -
 Price: $500

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_usp45.mdl"
 */

 enum
@ -254,6 +255,7 @@ w_usp45_reload(player pl)
 	static void w_weapon_reload_done(void) {
 		player pl = (player)self;
 		Weapons_ReloadWeapon(pl, player::usp45_mag, player::ammo_45acp, 12);
+		Cstrike_ShotReset(pl);
 	}

 	pl.think = w_weapon_reload_done;
--- a/src/shared/w_xm1014.qc
+++ b/src/shared/w_xm1014.qc
@ -14,8 +14,7 @@
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/*QUAKED weapon_xm1014 (0 0 1) (-16 -16 0) (16 16 32)
-"model" "models/w_xm1014.mdl"
+/*!QUAKED weapon_xm1014 (0 0 1) (-16 -16 0) (16 16 32)

 COUNTER-STRIKE (1999) ENTITY

@ -24,6 +23,8 @@ Benneli XM1014 Weapon
 - Buy Menu -
 Price: $3000

+-------- MODEL FOR RADIANT ONLY - DO NOT SET THIS AS A KEY --------
+model="models/w_xm1014.mdl"
 */

 #ifdef CLIENT
--- a/src/shared/weapons_cstrike.qc
+++ b/src/shared/weapons_cstrike.qc
@ -187,6 +187,14 @@ Cstrike_ShotMultiplierUpdate(player pl)

 	pl.cs_shottime = max(0, pl.cs_shottime - input_timelength);
 }
+
+void
+Cstrike_ShotReset(player pl)
+{
+	pl.cs_shottime = 0.0f;
+	pl.cs_shotmultiplier = 0;
+}
+
 void
 w_cstrike_weaponrelease(void)
 {
@ -194,3 +202,9 @@ w_cstrike_weaponrelease(void)
 	pl.punchangle[1] *= 0.95;
 	Cstrike_ShotMultiplierUpdate(pl);
 }
+
+void
+w_cstrke_switched(player pl)
+{
+	Cstrike_ShotReset(pl);
+}
--- a/zpak001.pk3dir/def/monsters.def
+++ b/zpak001.pk3dir/def/monsters.def
--- a/zpak001.pk3dir/def/weapons.def
+++ b/zpak001.pk3dir/def/weapons.def