CGrenade::Use: Fixed spam sound on defuse start, if player in air

s1lentq · Sep 21, 2019 · c35545a · c35545a
1 parent 22f5fe3
commit c35545a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/regamedll/dlls/ggrenade.cpp b/regamedll/dlls/ggrenade.cpp
@@ -1151,21 +1151,20 @@ void CGrenade::Use(CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE useTy
 	{
 #ifdef REGAMEDLL_FIXES
 		if (m_pBombDefuser == pPlayer)
+#endif
 		{
-			if ((pPlayer->pev->flags & FL_ONGROUND) != FL_ONGROUND) // Defuse should start only on ground
-			{
-				ClientPrint(pPlayer->pev, HUD_PRINTCENTER, "#C4_Defuse_Must_Be_On_Ground");
-				return;
-			}
-
 			m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME;
 		}
-#else
-		m_fNextDefuse = gpGlobals->time + NEXT_DEFUSE_TIME;
-#endif // #ifdef REGAMEDLL_FIXES
 
 		return;
 	}
+#ifdef REGAMEDLL_FIXES
+	else if ((pPlayer->pev->flags & FL_ONGROUND) != FL_ONGROUND) // Defuse should start only on ground
+	{
+		ClientPrint(pPlayer->pev, HUD_PRINTCENTER, "#C4_Defuse_Must_Be_On_Ground");
+		return;
+	}
+#endif
 
 	DefuseBombStart(pPlayer);
 }

diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
@@ -1502,8 +1502,8 @@ void CBasePlayer::RemoveAllItems(BOOL removeSuit)
 		m_pTank->Use(this, this, USE_OFF, 0);
 		m_pTank = nullptr;
 	}
-#endif	
-	
+#endif
+
 	if (m_bHasDefuser)
 	{
 		RemoveDefuser();