Remove Critical Hit Sound to Be Accurate to TU19/24

Minecraft.Client/Common/Audio/SoundNames.cpp

@@ -223,8 +223,6 @@ const WCHAR *ConsoleSoundEngine::wchSoundNames[eSoundType_MAX]=
 	// 4J-PB  - Some sounds were updated, but we can't do that for the 360 or we have to do a new sound bank
 	// instead, we'll add the sounds as new ones and change the code to reference them
 	L"fire.new_ignite",
-
-	L"damage.critical",					//eSoundType_DAMAGE_CRITICAL,
 };
 
 

Minecraft.World/DamageSource.cpp

@@ -124,7 +124,6 @@ DamageSource::DamageSource(ChatPacket::EChatPacketMessage msgId, ChatPacket::ECh
 	_isProjectile = false;
 	_isMagic = false;
 	_isExplosion = false;
-	_isCritical = false;
 
 	//this->msgId = msgId;
 	m_msgId = msgId;
@@ -154,15 +153,7 @@ DamageSource *DamageSource::bypassInvul()
 	_bypassInvul = true;
 	return this;
 }
-bool DamageSource::isCritical()
-{
-	return _isCritical;
-}
-DamageSource *DamageSource::setIsCritical()
-{
-	_isCritical = true;
-	return this;
-}
+
 DamageSource *DamageSource::setIsFire()
 {
 	isFireSource = true;

Minecraft.World/DamageSource.h

@@ -50,8 +50,6 @@ private:
 	bool _isCritical;
 
 public:
-	bool isCritical();
-	DamageSource *setIsCritical();
 	bool isProjectile();
 	DamageSource *setProjectile();
 	bool isExplosion();

Minecraft.World/EntityEvent.h

@@ -5,9 +5,7 @@ class EntityEvent
 public:
 	static const BYTE JUMP = 1;
 	static const BYTE HURT = 2;
-	//New
-	static const BYTE HURT_CRITICAL = 19;
-	static const BYTE DEATH_CRITICAL = 20;
+
 	static const BYTE DEATH = 3;
 	static const BYTE START_ATTACKING = 4;
 	static const BYTE STOP_ATTACKING = 5;

Minecraft.World/LivingEntity.h

@@ -187,7 +187,6 @@ public:
 	virtual void knockback(shared_ptr<Entity> source, float dmg, double xd, double zd);
 
 protected:
-	virtual int getCriticalSound();
 	virtual int getHurtSound();
 	virtual int getDeathSound();
 

Minecraft.World/Player.cpp

@@ -1632,9 +1632,6 @@ void Player::attack(shared_ptr<Entity> entity)
 
 		DamageSource *damageSource = DamageSource::playerAttack(dynamic_pointer_cast<Player>(shared_from_this()));
 
-		if (bCrit) {
-			damageSource->setIsCritical();
-		}
 		bool wasHurt = entity->hurt(damageSource, dmg);
 		delete damageSource;
 		if (wasHurt)

Minecraft.World/SoundTypes.h

@@ -213,8 +213,6 @@ enum eSOUND_TYPE
 
 	eSoundType_FIRE_NEWIGNITE,
 
-	eSoundType_DAMAGE_CRITICAL,
-
 	eSoundType_MAX
 };