[Refactor] #39970 Moved world.c/h to world/

[hengband/hengband.git] / src / artifact.c

diff --git a/src/artifact.c b/src/artifact.c
index 1795fc5..134f31b 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -20,7 +20,7 @@
 #include "floor.h"
 #include "cmd-activate.h"
 #include "object.h"
-#include "objectkind.h"
+#include "object/object-kind.h"
 #include "object-boost.h"
 #include "object-curse.h"
 #include "object-ego.h"
@@ -30,10 +30,10 @@
 #include "files.h"
 #include "grid.h"
 #include "monster.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-class.h"
 #include "player-personality.h"
-#include "world.h"
+#include "world/world.h"
 
  /*
   * The artifact arrays
@@ -1545,7 +1545,7 @@ static void give_activation_power(object_type *o_ptr)
        }
 
        /* A type was chosen... */
-       o_ptr->xtra2 = (byte_hack)type;
+       o_ptr->xtra2 = (byte)type;
        add_flag(o_ptr->art_flags, TR_ACTIVATE);
        o_ptr->timeout = 0;
 }
@@ -1903,12 +1903,12 @@ bool become_random_artifact(player_type *player_ptr, object_type *o_ptr, bool a_
                object_known(o_ptr);
 
                /* Mark the item as fully known */
-               o_ptr->ident |= (IDENT_MENTAL);
+               o_ptr->ident |= (IDENT_FULL_KNOWN);
 
                /* For being treated as random artifact in screen_object() */
                o_ptr->art_name = quark_add("");
 
-               (void)screen_object(o_ptr, 0L);
+               (void)screen_object(player_ptr, o_ptr, 0L);
 
                if (!get_string(ask_msg, dummy_name, sizeof dummy_name)
                        || !dummy_name[0])