From c6a3a89a2752e39b7a02bf33468913661399658b Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 23 Feb 2015 09:11:56 +0100 Subject: Remove unused music_extra2 flag --- src/dungeon.cc | 1 - src/loadsave.cc | 2 +- src/types.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/dungeon.cc b/src/dungeon.cc index 9f3c137f..02715e43 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -932,7 +932,6 @@ static void check_music() { msg_print("You stop your spell."); p_ptr->music_extra = 0; - p_ptr->music_extra2 = 0; } else { diff --git a/src/loadsave.cc b/src/loadsave.cc index b997e4c4..d992af75 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -638,7 +638,7 @@ static bool_ do_extra(int flag) do_u32b(&p_ptr->druid_extra2, flag); do_u32b(&p_ptr->druid_extra3, flag); do_u32b(&p_ptr->music_extra, flag); - do_u32b(&p_ptr->music_extra2, flag); + do_u32b(&tmp32u, flag); do_u32b(&p_ptr->necro_extra, flag); do_u32b(&p_ptr->necro_extra2, flag); diff --git a/src/types.h b/src/types.h index 7d7dfce6..e741c6a8 100644 --- a/src/types.h +++ b/src/types.h @@ -1694,7 +1694,6 @@ struct player_type u32b druid_extra2; /* Druid powers */ u32b druid_extra3; /* Druid powers */ u32b music_extra; /* Music songs */ - u32b music_extra2; /* Music songs */ u32b necro_extra; /* Necro powers */ u32b necro_extra2; /* Necro powers */ -- cgit v1.2.3