Merge pull request #595 from sikabane-works/release/3.0.0Alpha13

[hengbandforosx/hengbandosx.git] / src / object-hook / hook-quest.cpp

diff --git a/src/object-hook/hook-quest.cpp b/src/object-hook/hook-quest.cpp
index c4342c2..5bbd242 100644 (file)
--- a/src/object-hook/hook-quest.cpp
+++ b/src/object-hook/hook-quest.cpp
@@ -25,7 +25,7 @@ bool object_is_bounty(player_type *player_ptr, object_type *o_ptr)
     if (vanilla_town)
         return FALSE;
 
-    if (player_ptr->today_mon > 0 && (streq(r_name + r_info[o_ptr->pval].name, r_name + r_info[today_mon].name)))
+    if (player_ptr->today_mon > 0 && (streq(r_name + r_info[o_ptr->pval].name, r_name + r_info[current_world_ptr->today_mon].name)))
         return TRUE;
 
     if (o_ptr->pval == MON_TSUCHINOKO)
@@ -55,7 +55,7 @@ bool object_is_quest_target(QUEST_IDX quest_idx, object_type *o_ptr)
         return FALSE;
 
     artifact_type *a_ptr = &a_info[a_idx];
-    if ((a_ptr->gen_flags & TRG_INSTA_ART) != 0)
+    if (a_ptr->gen_flags.has(TRG::INSTA_ART))
         return FALSE;
 
     return (o_ptr->tval == a_ptr->tval) && (o_ptr->sval == a_ptr->sval);