Removed some get_hit_sound= keys from a few campaign units...

...and/or macroified defense animations.

data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg

@@ -126,7 +126,6 @@
 		[/abilities]
 		usage=fighter
 		unit_description= _ "A noble by birth, the Princess has learnt swordplay with the greatest generals, and battle tactics with the greatest sages, making her both a great combatant and leader. Now battle-hardened and strong of will, she can now aid those around her in the art of combat."
-		get_hit_sound={SOUND_LIST:HUMAN_FEMALE_HIT}
 		die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
 		[attack]
 			name=sabre
@@ -195,7 +194,7 @@
 			number=4
 			[animation]
 				{MISSILE_FRAME_FIREBALL}
-				
+
 				[frame]
 					begin=-200
 					end=-100

data/campaigns/Sceptre_of_Fire/units/Wolf.cfg

@@ -1,35 +1,28 @@
-[unit]
 #textdomain wesnoth-sof
-id=Wolf
-name= _ "Wolf"
-race=monster
-image="units/monsters/wolf.png"
-	[defend]
-		[frame]
-		begin=-150
-		end=-150
-		image="units/monsters/wolf-defend.png"
-		[/frame]
-	[/defend]
-hitpoints=37
-movement_type=smallfoot
-movement=5
-experience=500
-level=1
-alignment=neutral
-advanceto=null
-cost=17
-usage=fighter
-unit_description="Wolves are aggressive animals that hunt in packs. Although weak individually, a wolf pack can kill even the strongest man in minutes."
-get_hit_sound=wolf-hit.wav
-die_sound=wolf-die.wav
+[unit]
+	id=Wolf
+	name= _ "Wolf"
+	race=monster
+	image="units/monsters/wolf.png"
+	hitpoints=37
+	movement_type=smallfoot
+	movement=5
+	experience=500
+	level=1
+	alignment=neutral
+	advanceto=null
+	cost=17
+	usage=fighter
+	unit_description="Wolves are aggressive animals that hunt in packs. Although weak individually, a wolf pack can kill even the strongest man in minutes."
+	die_sound=wolf-die.wav
+	{DEFENSE_ANIM "units/monsters/wolf-defend.png" "units/monsters/wolf.png" wolf-hit.wav }
 	[attack]
-	name=bite
-	description= _"bite"
-	type=pierce
-	range=melee
-	damage=5
-	number=4
+		name=bite
+		description= _"bite"
+		type=pierce
+		range=melee
+		damage=5
+		number=4
 		[animation]
 			[frame]
 				begin=-190
@@ -57,12 +50,12 @@ die_sound=wolf-die.wav
 		[/animation]
 	[/attack]
 	[attack]
-	name=claws
-	description= _"claws"
-	type=blade
-	range=melee
-	damage=9
-	number=2
+		name=claws
+		description= _"claws"
+		type=blade
+		range=melee
+		damage=9
+		number=2
 		[animation]
 			[frame]
 				begin=-190

data/campaigns/tutorial/units/Fighter.cfg

@@ -15,8 +15,9 @@
 	cost=18
 	usage=mixed fighter
 	unit_description= _ "Young and brash, Fighters fight with a sword, and are vulnerable to attack from enemies. However they have the potential to become great warriors one day."
-	get_hit_sound={SOUND_LIST:HUMAN_HIT}
+	get_hit_sound=
 	die_sound={SOUND_LIST:HUMAN_DIE}
+	{DEFENSE_ANIM "konrad-fighter-defend.png" "konrad-fighter.png" {SOUND_LIST:HUMAN_HIT} }
 	[attack]
 		name=sword
 		description= _"sword"
@@ -74,11 +75,4 @@
 			[/frame]
 		[/animation]
 	[/attack]
-	[defend]
-		[frame]
-			begin=-150
-			end=150
-			image="konrad-fighter-defend.png"
-		[/frame]
-	[/defend]
 [/unit]