Replace all empty "spell_info" functions with a single function

3 files changed, 42 insertions, 265 deletions

diff --git a/src/externs.h b/src/externs.h
index 3586df38..3dbd910e 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1352,11 +1352,9 @@ extern s32b PROBABILITY_TRAVEL;
 casting_result  convey_blink(int);
 const char     *convey_blink_info();
 casting_result  convey_disarm(int);
-const char     *convey_disarm_info();
 casting_result  convey_teleport(int);
 const char     *convey_teleport_info();
 casting_result  convey_teleport_away(int);
-const char     *convey_teleport_away_info();
 casting_result  convey_recall(int);
 const char     *convey_recall_info();
 casting_result  convey_probability_travel(int);
@@ -1399,11 +1397,9 @@ extern s32b REVEALWAYS;
 extern s32b SENSEMONSTERS;
 
 casting_result  divination_greater_identify(int);
-const char     *divination_greater_identify_info();
 casting_result  divination_identify(int);
 const char     *divination_identify_info();
 casting_result  divination_vision(int);
-const char     *divination_vision_info();
 casting_result  divination_sense_hidden(int);
 const char     *divination_sense_hidden_info();
 casting_result  divination_reveal_ways(int);
@@ -1420,9 +1416,7 @@ extern s32b SHAKE;
 casting_result  earth_stone_skin(int);
 const char     *earth_stone_skin_info();
 casting_result  earth_dig(int);
-const char     *earth_dig_info();
 casting_result  earth_stone_prison(int);
-const char     *earth_stone_prison_info();
 casting_result  earth_strike(int);
 const char     *earth_strike_info();
 casting_result  earth_shake(int);
@@ -1436,9 +1430,7 @@ extern s32b ERU_PROT;
 casting_result  eru_see_the_music(int);
 const char     *eru_see_the_music_info();
 casting_result  eru_listen_to_the_music(int);
-const char     *eru_listen_to_the_music_info();
 casting_result  eru_know_the_music(int);
-const char     *eru_know_the_music_info();
 casting_result  eru_lay_of_protection(int);
 const char     *eru_lay_of_protection_info();
 
@@ -1471,9 +1463,7 @@ extern s32b ELEMENTAL_MINION;
 casting_result  geomancy_call_the_elements(int);
 const char     *geomancy_call_the_elements_info();
 casting_result  geomancy_channel_elements(int);
-const char     *geomancy_channel_elements_info();
 casting_result  geomancy_elemental_wave(int);
-const char     *geomancy_elemental_wave_info();
 casting_result  geomancy_vaporize(int);
 const char     *geomancy_vaporize_info();
 bool_           geomancy_vaporize_depends();
@@ -1484,7 +1474,6 @@ casting_result  geomancy_dripping_tread(int);
 const char     *geomancy_dripping_tread_info();
 bool_           geomancy_dripping_tread_depends();
 casting_result  geomancy_grow_barrier(int);
-const char     *geomancy_grow_barrier_info();
 bool_           geomancy_grow_barrier_depends();
 casting_result  geomancy_elemental_minion(int);
 const char     *geomancy_elemental_minion_info();
@@ -1497,7 +1486,6 @@ extern s32b MANASHIELD;
 casting_result  mana_manathrust(int);
 const char     *mana_manathrust_info();
 casting_result  mana_remove_curses(int);
-const char     *mana_remove_curses_info();
 casting_result  mana_elemental_shield(int);
 const char     *mana_elemental_shield_info();
 casting_result  mana_disruption_shield(int);
@@ -1524,7 +1512,6 @@ extern s32b MELKOR_MIND_STEAL;
 void do_melkor_curse(int m_idx);
 
 casting_result  melkor_curse(int);
-const char     *melkor_curse_info();
 casting_result  melkor_corpse_explosion(int);
 const char     *melkor_corpse_explosion_info();
 casting_result  melkor_mind_steal(int);
@@ -1542,9 +1529,7 @@ const char     *meta_recharge_info();
 casting_result  meta_spellbinder(int);
 const char     *meta_spellbinder_info();
 casting_result  meta_disperse_magic(int);
-const char     *meta_disperse_magic_info();
 casting_result  meta_tracker(int);
-const char     *meta_tracker_info();
 casting_result  meta_inertia_control(int);
 const char     *meta_inertia_control_info();
 
@@ -1572,7 +1557,6 @@ extern s32b ESSENCESPEED;
 extern s32b BANISHMENT;
 
 casting_result  tempo_magelock(int);
-const char     *tempo_magelock_info();
 casting_result  tempo_slow_monster(int);
 const char     *tempo_slow_monster_info();
 casting_result  tempo_essence_of_speed(int);
@@ -1589,7 +1573,6 @@ const char     *tulkas_divine_aim_info();
 casting_result  tulkas_wave_of_power(int);
 const char     *tulkas_wave_of_power_info();
 casting_result  tulkas_whirlwind(int);
-const char     *tulkas_whirlwind_info();
 
 extern s32b DRAIN;
 extern s32b GENOCIDE;
@@ -1600,9 +1583,7 @@ int udun_in_book(s32b sval, s32b pval);
 int levels_in_book(s32b sval, s32b pval);
 
 casting_result  udun_drain(int);
-const char     *udun_drain_info();
 casting_result  udun_genocide(int);
-const char     *udun_genocide_info();
 casting_result  udun_wraithform(int);
 const char     *udun_wraithform_info();
 casting_result  udun_flame_of_udun(int);
@@ -1654,13 +1635,11 @@ const char     *nature_grow_trees_info();
 casting_result  nature_healing(int);
 const char     *nature_healing_info();
 casting_result  nature_recovery(int);
-const char     *nature_recovery_info();
 casting_result  nature_regeneration(int);
 const char     *nature_regeneration_info();
 casting_result  nature_summon_animal(int);
 const char     *nature_summon_animal_info();
 casting_result  nature_grow_athelas(int);
-const char     *nature_grow_athelas_info();
 
 extern s32b DEVICE_HEAL_MONSTER;
 extern s32b DEVICE_SPEED_MONSTER;
@@ -1682,29 +1661,20 @@ const char     *device_heal_monster_info();
 casting_result  device_haste_monster(int);
 const char     *device_haste_monster_info();
 casting_result  device_wish(int);
-const char     *device_wish_info();
 casting_result  device_summon_monster(int);
-const char     *device_summon_monster_info();
 casting_result  device_mana(int);
 const char     *device_mana_info();
 casting_result  device_nothing(int);
-const char     *device_nothing_info();
 casting_result  device_lebohaum(int);
-const char     *device_lebohaum_info();
 casting_result  device_maggot(int);
 const char     *device_maggot_info();
 casting_result  device_holy_fire(int);
 const char     *device_holy_fire_info();
 casting_result  device_eternal_flame(int);
-const char     *device_eternal_flame_info();
 casting_result  device_durandil(int);
-const char     *device_durandil_info();
 casting_result  device_thunderlords(int);
-const char     *device_thunderlords_info();
 casting_result  device_radagast(int);
-const char     *device_radagast_info();
 casting_result  device_valaroma(int);
-const char     *device_valaroma_info();
 
 extern s32b MUSIC_STOP;
 extern s32b MUSIC_HOLD;
@@ -1721,51 +1691,35 @@ extern s32b MUSIC_YLMIR;
 extern s32b MUSIC_AMBARKANTA;
 
 casting_result  music_stop_singing_spell(int);
-const char     *music_stop_singing_info();
-
 int             music_holding_pattern_lasting();
 casting_result  music_holding_pattern_spell(int);
 const char     *music_holding_pattern_info();
-
 int             music_illusion_pattern_lasting();
 casting_result  music_illusion_pattern_spell(int);
 const char     *music_illusion_pattern_info();
-
 int             music_stun_pattern_lasting();
 casting_result  music_stun_pattern_spell(int);
 const char     *music_stun_pattern_info();
-
 int             music_song_of_the_sun_lasting();
 casting_result  music_song_of_the_sun_spell(int);
-const char     *music_song_of_the_sun_info();
-
 int             music_flow_of_life_lasting();
 casting_result  music_flow_of_life_spell(int);
 const char     *music_flow_of_life_info();
-
 int             music_heroic_ballad_lasting();
 casting_result  music_heroic_ballad_spell(int);
-const char     *music_heroic_ballad_info();
-
 int             music_hobbit_melodies_lasting();
 casting_result  music_hobbit_melodies_spell(int);
 const char     *music_hobbit_melodies_info();
-
 int             music_clairaudience_lasting();
 casting_result  music_clairaudience_spell(int);
 const char     *music_clairaudience_info();
-
 casting_result  music_blow_spell(int);
 const char     *music_blow_info();
-
 casting_result  music_gush_of_wind_spell(int);
 const char     *music_gush_of_wind_info();
-
 casting_result  music_horns_of_ylmir_spell(int);
 const char     *music_horns_of_ylmir_info();
-
 casting_result  music_ambarkanta_spell(int);
-const char     *music_ambarkanta_info();
 
 extern s32b AULE_FIREBRAND;
 extern s32b AULE_ENCHANT_WEAPON;
@@ -1817,9 +1771,7 @@ extern s32b VARDA_STARKINDLER;
 casting_result  varda_light_of_valinor_spell(int);
 const char     *varda_light_of_valinor_info();
 casting_result  varda_call_of_almaren_spell(int);
-const char     *varda_call_of_almaren_info();
 casting_result  varda_evenstar_spell(int);
-const char     *varda_evenstar_info();
 casting_result  varda_star_kindler_spell(int);
 const char     *varda_star_kindler_info();
 
diff --git a/src/spells3.cc b/src/spells3.cc
index 4bcc5a53..1a1662ba 100644
--- a/src/spells3.cc
+++ b/src/spells3.cc
@@ -392,11 +392,6 @@ casting_result convey_disarm(int item)
 	return result;
 }
 
-const char *convey_disarm_info()
-{
-	return "";
-}
-
 casting_result convey_teleport(int item)
 {
 	p_ptr->energy -= (25 - get_level_s(TELEPORT, 50));
@@ -440,11 +435,6 @@ casting_result convey_teleport_away(int item)
 	}
 }
 
-const char *convey_teleport_away_info()
-{
-	return "";
-}
-
 static int recall_get_d()
 {
 	int d = 21 - get_level_s(RECALL, 15);
@@ -890,11 +880,6 @@ casting_result divination_greater_identify(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *divination_greater_identify_info()
-{
-	return "";
-}
-
 casting_result divination_identify(int item)
 {
 	if (get_level_s(IDENTIFY, 50) >= 27)
@@ -950,11 +935,6 @@ casting_result divination_vision(int item)
 
 }
 
-const char *divination_vision_info()
-{
-	return "";
-}
-
 casting_result divination_sense_hidden(int item)
 {
 	casting_result result = NO_CAST;
@@ -1091,11 +1071,6 @@ casting_result earth_dig(int item)
 	return cast(wall_to_mud(dir));
 }
 
-const char *earth_dig_info()
-{
-	return "";
-}
-
 casting_result earth_stone_prison(int item)
 {
 	int x,y;
@@ -1117,11 +1092,6 @@ casting_result earth_stone_prison(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *earth_stone_prison_info()
-{
-	return "";
-}
-
 casting_result earth_strike(int item)
 {
 	int dir, dmg;
@@ -1241,11 +1211,6 @@ casting_result eru_listen_to_the_music(int item)
 	return result;
 }
 
-const char *eru_listen_to_the_music_info()
-{
-	return "";
-}
-
 casting_result eru_know_the_music(int item)
 {
 	if (get_level_s(ERU_UNDERSTAND, 50) >= 10)
@@ -1259,11 +1224,6 @@ casting_result eru_know_the_music(int item)
 	}
 }
 
-const char *eru_know_the_music_info()
-{
-	return "";
-}
-
 casting_result eru_lay_of_protection(int item)
 {
 	return cast(fire_ball(GF_MAKE_GLYPH, 0, 1, 1 + get_level(ERU_PROT, 2, 0)));
@@ -1500,11 +1460,6 @@ casting_result geomancy_channel_elements(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *geomancy_channel_elements_info()
-{
-	return "";
-}
-
 typedef struct eff_type eff_type;
 struct eff_type {
 	s16b feat;
@@ -1610,11 +1565,6 @@ casting_result geomancy_elemental_wave(int item)
 	}
 }
 
-const char *geomancy_elemental_wave_info()
-{
-	return "";
-}
-
 casting_result geomancy_vaporize(int item)
 {
 	eff_type *eff_ptr = NULL;
@@ -1751,11 +1701,6 @@ casting_result geomancy_grow_barrier(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *geomancy_grow_barrier_info()
-{
-	return "";
-}
-
 bool_ geomancy_grow_barrier_depends()
 {
 	return get_skill(SKILL_EARTH) >= 12;
@@ -1951,11 +1896,6 @@ casting_result mana_remove_curses(int item)
 	return result;
 }
 
-const char *mana_remove_curses_info()
-{
-	return "";
-}
-
 casting_result mana_elemental_shield(int item)
 {
 	casting_result res = NO_CAST;
@@ -2264,11 +2204,6 @@ casting_result melkor_curse(int item)
 	}
 }
 
-const char *melkor_curse_info()
-{
-	return "";
-}
-
 casting_result melkor_corpse_explosion(int item)
 {
 	return cast(fire_ball(GF_CORPSE_EXPL,
@@ -2499,11 +2434,6 @@ casting_result meta_disperse_magic(int item)
 	return res;
 }
 
-const char *meta_disperse_magic_info()
-{
-	return "";
-}
-
 casting_result meta_tracker(int item)
 {
 	if ((last_teleportation_y < 0) ||
@@ -2518,11 +2448,6 @@ casting_result meta_tracker(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *meta_tracker_info()
-{
-	return "";
-}
-
 static void stop_inertia_controlled_spell()
 {
 	assert(TIMER_INERTIA_CONTROL != NULL);
@@ -2812,11 +2737,6 @@ casting_result tempo_magelock(int item)
 	}
 }
 
-const char *tempo_magelock_info()
-{
-	return "";
-}
-
 static s32b tempo_slow_monster_power()
 {
 	return 40 + get_level_s(SLOWMONSTER, 160);
@@ -2968,11 +2888,6 @@ casting_result tulkas_whirlwind(int item)
 	return cast(fire_ball(GF_ATTACK, 0, 1, 1));
 }
 
-const char *tulkas_whirlwind_info()
-{
-	return "";
-}
-
 static bool_ check_school_is_udun(void *data, s32b school_idx)
 {
 	int *count = (int *) data;
@@ -3090,11 +3005,6 @@ casting_result udun_drain(int ignored)
 	return CAST_OBVIOUS;
 }
 
-const char *udun_drain_info()
-{
-	return "";
-}
-
 casting_result udun_genocide(int item)
 {
 	if (get_level_s(GENOCIDE, 50) < 10)
@@ -3116,11 +3026,6 @@ casting_result udun_genocide(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *udun_genocide_info()
-{
-	return "";
-}
-
 static int udun_wraithform_base_duration()
 {
 	return 20 + get_level_s(WRAITHFORM, 40);
@@ -3604,11 +3509,6 @@ casting_result nature_recovery(int item)
 	return result;
 }
 
-const char *nature_recovery_info()
-{
-	return "";
-}
-
 static int regeneration_base_duration()
 {
 	return 5 + get_level_s(REGENERATION, 50);
@@ -3675,11 +3575,6 @@ casting_result nature_grow_athelas(int item)
 	return CAST_HIDDEN;
 }
 
-const char *nature_grow_athelas_info()
-{
-	return "";
-}
-
 static int device_heal_monster_hp()
 {
 	return 20 + get_level_s(DEVICE_HEAL_MONSTER, 380);
@@ -3729,11 +3624,6 @@ casting_result device_wish(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *device_wish_info()
-{
-	return "";
-}
-
 casting_result device_summon_monster(int item)
 {
 	casting_result result = NO_CAST;
@@ -3747,11 +3637,6 @@ casting_result device_summon_monster(int item)
 	return result;
 }
 
-const char *device_summon_monster_info()
-{
-	return "";
-}
-
 static int device_mana_pct()
 {
 	return 20 + get_level_s(DEVICE_MANA, 50);
@@ -3777,11 +3662,6 @@ casting_result device_nothing(int item)
 	return CAST_HIDDEN;
 }
 
-const char *device_nothing_info()
-{
-	return "";
-}
-
 casting_result device_lebohaum(int item)
 {
 	msg_print("You hear a little song in your head in some unknown tongue:");
@@ -3791,11 +3671,6 @@ casting_result device_lebohaum(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *device_lebohaum_info()
-{
-	return "";
-}
-
 casting_result device_maggot(int item)
 {
 	int dir;
@@ -3914,11 +3789,6 @@ casting_result device_eternal_flame(int flame_item)
 	return CAST_OBVIOUS;
 }
 
-const char *device_eternal_flame_info()
-{
-	return "";
-}
-
 casting_result device_durandil(int item)
 {
 	msg_print("You hear a little song in your head in some unknown tongue:");
@@ -3936,11 +3806,6 @@ casting_result device_durandil(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *device_durandil_info()
-{
-	return "";
-}
-
 casting_result device_thunderlords(int item)
 {
 	switch (game_module_idx)
@@ -3979,11 +3844,6 @@ casting_result device_thunderlords(int item)
 	}
 }
 
-const char *device_thunderlords_info()
-{
-	return "";
-}
-
 casting_result device_radagast(int item)
 {
 	cmsg_print(TERM_GREEN, "The staff's power cleanses you completely!");
@@ -4018,11 +3878,6 @@ casting_result device_radagast(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *device_radagast_info()
-{
-	return "";
-}
-
 casting_result device_valaroma(int item)
 {
 	int power = 5 * p_ptr->lev;
@@ -4030,11 +3885,6 @@ casting_result device_valaroma(int item)
 	return CAST_HIDDEN;
 }
 
-const char *device_valaroma_info()
-{
-	return "";
-}
-
 void static start_lasting_spell(int spl)
 {
 	p_ptr->music_extra = -spl;
@@ -4046,11 +3896,6 @@ casting_result music_stop_singing_spell(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *music_stop_singing_info()
-{
-	return "";
-}
-
 static int holding_pattern_power()
 {
 	return 10 + get_level_s(MUSIC_HOLD, 100);
@@ -4141,11 +3986,6 @@ casting_result music_song_of_the_sun_spell(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *music_song_of_the_sun_info()
-{
-	return "";
-}
-
 int flow_of_life_hp()
 {
 	return 7 + get_level_s(MUSIC_HEAL, 100);
@@ -4196,11 +4036,6 @@ casting_result music_heroic_ballad_spell(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *music_heroic_ballad_info()
-{
-	return "";
-}
-
 int music_hobbit_melodies_lasting()
 {
 	set_shield(5, 10 + get_level_s(MUSIC_TIME, 50), 0, 0, 0);
@@ -4326,11 +4161,6 @@ casting_result music_ambarkanta_spell(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *music_ambarkanta_info()
-{
-	return "";
-}
-
 casting_result aule_firebrand_spell(int item)
 {
 	int rad = 0;
@@ -4880,11 +4710,6 @@ casting_result varda_call_of_almaren_spell(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *varda_call_of_almaren_info()
-{
-	return "";
-}
-
 casting_result varda_evenstar_spell(int item)
 {
 	wiz_lite_extra();
@@ -4897,11 +4722,6 @@ casting_result varda_evenstar_spell(int item)
 	return CAST_OBVIOUS;
 }
 
-const char *varda_evenstar_info()
-{
-	return "";
-}
-
 static int star_kindler_bursts()
 {
 	return p_ptr->lev / 5;
diff --git a/src/spells5.cc b/src/spells5.cc
index 0566768f..a0cffdd7 100644
--- a/src/spells5.cc
+++ b/src/spells5.cc
@@ -18,6 +18,11 @@ static spell_type *spell_new(s32b *index, cptr name)
 	return spell;
 }
 
+static cptr no_info()
+{
+	return "";
+}
+
 spell_type *spell_at(s32b index)
 {
 	assert(index >= 0);
@@ -70,7 +75,7 @@ static void spells_init_tome()
 		spell_type_set_mana(spell, 0, 0);
 		spell_type_set_difficulty(spell, 1, 0);
 		spell_type_init_device(spell,
-				       device_lebohaum_info,
+				       no_info,
 				       device_lebohaum);
 	}
 
@@ -81,7 +86,7 @@ static void spells_init_tome()
 		spell_type_set_mana(spell, 0, 0);
 		spell_type_set_difficulty(spell, 1, 0);
 		spell_type_init_device(spell,
-				       device_durandil_info,
+				       no_info,
 				       device_durandil);
 	}
 
@@ -91,7 +96,7 @@ static void spells_init_tome()
 		spell_type_set_mana(spell, 1, 1);
 		spell_type_set_difficulty(spell, 1, 20);
 		spell_type_init_device(spell,
-				       device_thunderlords_info,
+				       no_info,
 				       device_thunderlords);
 
 		spell_type_set_device_charges(spell, "3+d3");
@@ -116,7 +121,7 @@ static void spells_init_theme()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_NATURE,
-				     nature_grow_athelas_info,
+				     no_info,
 				     nature_grow_athelas);
 
 		spell_type_set_device_charges(spell, "1+d3");
@@ -204,7 +209,7 @@ static void spells_init_theme()
 		spell_type_set_difficulty(spell, 10, 20);
 		spell_type_init_priest(spell,
 				       SCHOOL_VARDA,
-				       varda_call_of_almaren_info,
+				       no_info,
 				       varda_call_of_almaren_spell);
 	}
 
@@ -218,7 +223,7 @@ static void spells_init_theme()
 		spell_type_set_difficulty(spell, 20, 20);
 		spell_type_init_priest(spell,
 				       SCHOOL_VARDA,
-				       varda_evenstar_info,
+				       no_info,
 				       varda_evenstar_spell);
 	}
 
@@ -338,7 +343,7 @@ static void spells_init_theme()
 		spell_type_set_mana(spell, 1, 1);
 		spell_type_set_difficulty(spell, 1, 20);
 		spell_type_init_device(spell,
-				       device_thunderlords_info,
+				       no_info,
 				       device_thunderlords);
 
 		spell_type_set_device_charges(spell, "5+d5");
@@ -359,7 +364,7 @@ static void spells_init_theme()
 		spell_type_set_mana(spell, 0, 0);
 		spell_type_set_difficulty(spell, 1, 10);
 		spell_type_init_device(spell,
-				       device_radagast_info,
+				       no_info,
 				       device_radagast);
 	}
 
@@ -370,7 +375,7 @@ static void spells_init_theme()
 		spell_type_set_mana(spell, 0, 0);
 		spell_type_set_difficulty(spell, 1, 25);
 		spell_type_init_device(spell,
-				       device_valaroma_info,
+				       no_info,
 				       device_valaroma);
 	}
 }
@@ -539,7 +544,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_MANA,
-				     mana_remove_curses_info,
+				     no_info,
 				     mana_remove_curses);
 
 		spell_type_set_device_charges(spell, "3+d8");
@@ -828,7 +833,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_EARTH,
-				     earth_dig_info,
+				     no_info,
 				     earth_dig);
 
 		spell_type_set_device_charges(spell, "15+d5");
@@ -851,7 +856,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_EARTH,
-				     earth_stone_prison_info,
+				     no_info,
 				     earth_stone_prison);
 
 		spell_type_set_device_charges(spell, "5+d3");
@@ -937,7 +942,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_CONVEYANCE,
-				     convey_disarm_info,
+				     no_info,
 				     convey_disarm);
 
 		spell_type_set_device_charges(spell, "10+d15");
@@ -984,7 +989,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_CONVEYANCE,
-				     convey_teleport_away_info,
+				     no_info,
 				     convey_teleport_away);
 
 		spell_type_set_device_charges(spell, "3+d5");
@@ -1085,7 +1090,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_NATURE,
-				     nature_recovery_info,
+				     no_info,
 				     nature_recovery);
 
 		spell_type_set_device_charges(spell, "5+d10");
@@ -1143,7 +1148,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_DIVINATION,
-				     divination_greater_identify_info,
+				     no_info,
 				     divination_greater_identify);
 	}
 
@@ -1182,7 +1187,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_DIVINATION,
-				     divination_vision_info,
+				     no_info,
 				     divination_vision);
 
 		spell_type_set_device_charges(spell, "4+d6");
@@ -1277,7 +1282,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_TEMPORAL,
-				     tempo_magelock_info,
+				     no_info,
 				     tempo_magelock);
 
 		spell_type_set_device_charges(spell, "7+d5");
@@ -1408,7 +1413,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_META,
-				     meta_disperse_magic_info,
+				     no_info,
 				     meta_disperse_magic);
 
 		spell_type_set_device_charges(spell, "5+d5");
@@ -1432,7 +1437,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_META,
-				     meta_tracker_info,
+				     no_info,
 				     meta_tracker);
 	}
 
@@ -1534,7 +1539,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_UDUN,
-				     udun_drain_info,
+				     no_info,
 				     udun_drain);
 	}
 
@@ -1548,7 +1553,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     RANDOM,
 				     SCHOOL_UDUN,
-				     udun_genocide_info,
+				     no_info,
 				     udun_genocide);
 
 		spell_type_set_device_charges(spell, "2+d2");
@@ -1627,7 +1632,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     NO_RANDOM,
 				     SCHOOL_GEOMANCY,
-				     geomancy_channel_elements_info,
+				     no_info,
 				     geomancy_channel_elements);
 	}
 
@@ -1642,7 +1647,7 @@ void school_spells_init()
 		spell_type_init_mage(spell,
 				     NO_RANDOM,
 				     SCHOOL_GEOMANCY,
-				     geomancy_elemental_wave_info,
+				     no_info,
 				     geomancy_elemental_wave);
 	}
 
@@ -1695,7 +1700,7 @@ void school_spells_init()
 		spell_type_set_castable_while_blind(spell, TRUE);
 		spell_type_init_geomancy(
 			spell,
-			geomancy_grow_barrier_info,
+			no_info,
 			geomancy_grow_barrier,
 			geomancy_grow_barrier_depends);
 	}
@@ -1743,7 +1748,7 @@ void school_spells_init()
 		spell_type_set_difficulty(spell, 7, 25);
 		spell_type_init_priest(spell,
 				       SCHOOL_ERU,
-				       eru_listen_to_the_music_info,
+				       no_info,
 				       eru_listen_to_the_music);
 	}
 
@@ -1756,7 +1761,7 @@ void school_spells_init()
 		spell_type_set_difficulty(spell, 30, 50);
 		spell_type_init_priest(spell,
 				       SCHOOL_ERU,
-				       eru_know_the_music_info,
+				       no_info,
 				       eru_know_the_music);
 	}
 
@@ -1852,7 +1857,7 @@ void school_spells_init()
 		spell_type_set_difficulty(spell, 10, 45);
 		spell_type_init_priest(spell,
 				       SCHOOL_TULKAS,
-				       tulkas_whirlwind_info,
+				       no_info,
 				       tulkas_whirlwind);
 	}
 
@@ -1867,7 +1872,7 @@ void school_spells_init()
 		spell_type_set_difficulty(spell, 1, 20);
 		spell_type_init_priest(spell,
 				       SCHOOL_MELKOR,
-				       melkor_curse_info,
+				       no_info,
 				       melkor_curse);
 	}
 
@@ -2106,7 +2111,7 @@ void school_spells_init()
 		spell_type_set_mana(spell, 400, 400);
 		spell_type_set_difficulty(spell, 50, 99);
 		spell_type_init_device(spell,
-				       device_wish_info,
+				       no_info,
 				       device_wish);
 
 		spell_type_set_device_charges(spell, "1+d2");
@@ -2126,7 +2131,7 @@ void school_spells_init()
 		spell_type_set_mana(spell, 5, 25);
 		spell_type_set_difficulty(spell, 5, 20);
 		spell_type_init_device(spell,
-				       device_summon_monster_info,
+				       no_info,
 				       device_summon_monster);
 
 		spell_type_set_device_charges(spell, "1+d20");
@@ -2166,7 +2171,7 @@ void school_spells_init()
 		spell_type_set_mana(spell, 0, 0);
 		spell_type_set_difficulty(spell, 1, 0);
 		spell_type_init_device(spell,
-				       device_nothing_info,
+				       no_info,
 				       device_nothing);
 
 		spell_type_set_device_charges(spell, "0+d0");
@@ -2227,7 +2232,7 @@ void school_spells_init()
 		spell_type_set_mana(spell, 0, 0);
 		spell_type_set_difficulty(spell, 1, 0);
 		spell_type_init_device(spell,
-				       device_eternal_flame_info,
+				       no_info,
 				       device_eternal_flame);
 	}
 
@@ -2239,7 +2244,7 @@ void school_spells_init()
 		spell_type_set_castable_while_blind(spell, TRUE);
 		spell_type_init_music(spell,
 				      1,
-				      music_stop_singing_info,
+				      no_info,
 				      music_stop_singing_spell);
 	}
 
@@ -2298,7 +2303,7 @@ void school_spells_init()
 		spell_type_init_music_lasting(
 			spell,
 			1,
-			music_song_of_the_sun_info,
+			no_info,
 			music_song_of_the_sun_spell,
 			music_song_of_the_sun_lasting);
 	}
@@ -2329,7 +2334,7 @@ void school_spells_init()
 		spell_type_init_music_lasting(
 			spell,
 			2,
-			music_heroic_ballad_info,
+			no_info,
 			music_heroic_ballad_spell,
 			music_heroic_ballad_lasting);
 	}
@@ -2406,7 +2411,7 @@ void school_spells_init()
 		spell_type_set_difficulty(spell, 25, 60);
 		spell_type_init_music(spell,
 				      4,
-				      music_ambarkanta_info,
+				      no_info,
 				      music_ambarkanta_spell);
 	}