Merge pull request #3192 from Hourier/Divide-IsAutopickMatch

関数マクロIS_FLG() を削除した

diff --cc src/autopick/autopick-finder.cpp
Simple merge

diff --cc src/cmd-io/cmd-autopick.cpp
index 54e6cda,6c23a3e..d70fa54
--- 1/src/cmd-io/cmd-autopick.cpp
--- 2/src/cmd-io/cmd-autopick.cpp
+++ b/src/cmd-io/cmd-autopick.cpp
@@@ -139,9 -139,9 +139,9 @@@ void do_cmd_edit_autopick(PlayerType *p
  
      update_playtime();
      init_autopick();
 -    if (autopick_last_destroyed_object.bi_id) {
 +    if (autopick_last_destroyed_object.is_valid()) {
          autopick_entry_from_object(player_ptr, entry, &autopick_last_destroyed_object);
-         tb->last_destroyed = autopick_line_from_entry_kill(entry);
+         tb->last_destroyed = autopick_line_from_entry(*entry);
      }
  
      tb->lines_list = read_pickpref_text_lines(player_ptr, &tb->filename_mode);