Merge pull request #95 from hedgefog/master

bugfix

Author: hedgefog

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "zombiepanic",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "CS Zombie Panic",
   "scripts": {
     "build": "amxxpack build",

package.json

@@ -1,4 +1,8 @@
 /*
+    1.5.1
+        Fixes:
+            Fixed grenade throw on holster
+
     1.5.0
         Common:
             Refactored the entire codebase using AMXX Modding Kit

src/include/zombiepanic.inc

@@ -6,7 +6,7 @@
 #include <weapon_base_throwable_const>
 
 #define ZP_TITLE "Zombie Panic"
-#define ZP_VERSION "1.5.0"
+#define ZP_VERSION "1.5.1"
 
 /*--------------------------------[ Constants ]--------------------------------*/
 

src/include/zombiepanic_const.inc

@@ -97,8 +97,6 @@ public plugin_init() {
 
   CW_RegisterClassNativeMethodHook(WEAPON(Base), CW_Method_PrimaryAttack, "CWHook_Weapon_Attack_Post", true);
   CW_RegisterClassNativeMethodHook(WEAPON(Base), CW_Method_SecondaryAttack, "CWHook_Weapon_Attack_Post", true);
-  CW_RegisterClassNativeMethodHook(WEAPON(Grenade), CW_Method_PrimaryAttack, "CWHook_Weapon_Attack_Post", true);
-  CW_RegisterClassNativeMethodHook(WEAPON(Grenade), CW_Method_SecondaryAttack, "CWHook_Weapon_Attack_Post", true);
 
   CE_RegisterClassNativeMethodHook(ENTITY(Button), CE_Method_Use, "CEHook_Button_Use_Post", true);
 

src/scripts/player-roles/base.sma

@@ -65,6 +65,7 @@ public plugin_init() {
   CW_SetMember(this, CW_Member_iSlot, 3);
   CW_SetMember(this, CW_Member_iPosition, 0);
   CW_SetMemberString(this, CW_Member_szIcon, "handgrenade");
+  CW_SetMember(this, Weapon_BaseThrowable_Member_bThrowOnHolster, true);
   CW_SetMemberString(this, WEAPON_BASE_MEMBER(szBounceSound), g_rgszBounceSounds[random(g_iBounceSoundsNum)]);
 }
 
@@ -76,16 +77,11 @@ public plugin_init() {
 
 @Weapon_Holster(const this) {
   static pPlayer; pPlayer = get_ent_data_entity(this, "CBasePlayerItem", "m_pPlayer");
-  static Float:flStartThrow; flStartThrow = CW_GetMember(this, BASEGRENADE_MEMBER(flStartThrow));
-
-  if (!is_user_connected(pPlayer)) return;
 
-  if (flStartThrow) {
-    CW_CallMethod(this, BASEGRENADE_METHOD(Throw));
+  if (is_user_connected(pPlayer)) {
+    emit_sound(pPlayer, CHAN_WEAPON, "common/null.wav", VOL_NORM, ATTN_NORM, 0, PITCH_NORM);
   }
 
-  emit_sound(pPlayer, CHAN_WEAPON, "common/null.wav", VOL_NORM, ATTN_NORM, 0, PITCH_NORM);
-
   CW_CallBaseMethod();
 }