From da064cf60c7f8b9fd0e4d267b50420f3eb780a03 Mon Sep 17 00:00:00 2001 From: Night Owl Date: Tue, 20 Jun 2017 04:09:23 +0500 Subject: [PATCH] Define new weapons. --- dlls/weapons.cpp | 9 ++++++--- dlls/weapons.h | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp index ff39d672..85da3f4d 100644 --- a/dlls/weapons.cpp +++ b/dlls/weapons.cpp @@ -338,9 +338,6 @@ void W_Precache( void ) // tripmine UTIL_PrecacheOtherWeapon( "weapon_tripmine" ); - // hand grenade - UTIL_PrecacheOtherWeapon("weapon_handgrenade"); - // squeak grenade UTIL_PrecacheOtherWeapon( "weapon_snark" ); @@ -404,6 +401,9 @@ void W_Precache( void ) UTIL_PrecacheOtherWeapon( "weapon_rifle" ); UTIL_PrecacheOther( "ammo_rifleclip" ); + // H&K G36 + UTIL_PrecacheOtherWeapon( "weapon_g36" ); + // railgun/hallucegon UTIL_PrecacheOtherWeapon( "weapon_railgun" ); UTIL_PrecacheOther( "ammo_railslug" ); @@ -439,6 +439,9 @@ void W_Precache( void ) UTIL_PrecacheOtherWeapon( "weapon_nuke" ); UTIL_PrecacheOther( "ammo_nukeclip" ); + // hand grenade + UTIL_PrecacheOtherWeapon( "weapon_handgrenade" ); + // cluster grenade UTIL_PrecacheOtherWeapon( "weapon_clustergrenade" ); diff --git a/dlls/weapons.h b/dlls/weapons.h index 7510f1a9..d926c1f5 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -97,7 +97,8 @@ public: #define WEAPON_DOUBLEMAC 25 #define WEAPON_NAILGUN 26 #define WEAPON_SATCHEL 27 -#define WEAPON_UNKNOWN 28 +#define WEAPON_HANDGRENADE 28 +#define WEAPON_HKG36 29 #define WEAPON_ALLWEAPONS (~(1<