Use ARX_SOUND_PlaySFX directly

arx · Jun 10, 2014 · 62e3f61 · 62e3f61
1 parent cb70e08
commit 62e3f61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/game/Spells.cpp b/src/game/Spells.cpp
@@ -670,14 +670,11 @@ void SPELLEND_Notify(SpellBase & spell) {
 
 //! Plays the sound of Fizzling spell
 void ARX_SPELLS_Fizzle(SpellHandle num) {
-	if(num < 0) {
-		ARX_SOUND_PlaySFX(SND_MAGIC_FIZZLE); // player fizzle
-	} else {
-		spells[num]->m_tolive = 0;
-
-		if(spells[num]->m_caster >= PlayerEntityHandle) {
-			ARX_SOUND_PlaySFX(SND_MAGIC_FIZZLE, &spells[num]->m_caster_pos);
-		}
+
+	spells[num]->m_tolive = 0;
+
+	if(spells[num]->m_caster >= PlayerEntityHandle) {
+		ARX_SOUND_PlaySFX(SND_MAGIC_FIZZLE, &spells[num]->m_caster_pos);
 	}
 }
 

diff --git a/src/game/magic/SpellRecognition.cpp b/src/game/magic/SpellRecognition.cpp
@@ -956,8 +956,6 @@ void ARX_SPELLS_AnalyseSYMBOL() {
 	}
 }
 
-extern void ARX_SPELLS_Fizzle(SpellHandle num);
-
 bool ARX_SPELLS_AnalyseSPELL() {
 
 	SpellcastFlags flags = 0;
@@ -980,8 +978,7 @@ bool ARX_SPELLS_AnalyseSPELL() {
 	}
 
 	if(spell == SPELL_NONE) {
-
-		ARX_SPELLS_Fizzle(InvalidSpellHandle);
+		ARX_SOUND_PlaySFX(SND_MAGIC_FIZZLE);
 
 		if(player.SpellToMemorize.bSpell) {
 			CurrSpellSymbol = 0;