[feature] ソースファイルをC++に対応

[hengbandforosx/hengbandosx.git] / src / cmd-item / cmd-destroy.c

diff --git a/src/cmd-item/cmd-destroy.c b/src/cmd-item/cmd-destroy.c
index fce562a..b17ccd6 100644 (file)
--- a/src/cmd-item/cmd-destroy.c
+++ b/src/cmd-item/cmd-destroy.c
@@ -1,4 +1,4 @@
-#include "cmd-item/cmd-destroy.h"
+#include "cmd-item/cmd-destroy.h"
 #include "autopick/autopick-registry.h"
 #include "autopick/autopick.h"
 #include "core/asking-player.h"
@@ -21,7 +21,7 @@
 #include "object/object-stack.h"
 #include "object/object-value.h"
 #include "player/attack-defense-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
 #include "player/special-defense-types.h"
 #include "racial/racial-android.h"
 #include "realm/realm-names-table.h"
@@ -57,10 +57,10 @@ static bool check_destory_item(player_type *creature_ptr, destroy_type *destroy_
         return TRUE;
 
     describe_flavor(creature_ptr, destroy_ptr->o_name, destroy_ptr->o_ptr, OD_OMIT_PREFIX);
-    sprintf(destroy_ptr->out_val, _("\96{\93\96\82É%s\82ð\89ó\82µ\82Ü\82·\82©? [y/n/Auto]", "Really destroy %s? [y/n/Auto]"), destroy_ptr->o_name);
+    sprintf(destroy_ptr->out_val, _("本当に%sを壊しますか? [y/n/Auto]", "Really destroy %s? [y/n/Auto]"), destroy_ptr->o_name);
     msg_print(NULL);
     message_add(destroy_ptr->out_val);
-    creature_ptr->window |= PW_MESSAGE;
+    creature_ptr->window_flags |= PW_MESSAGE;
     handle_stuff(creature_ptr);
     while (TRUE) {
         prt(destroy_ptr->out_val, 0, 0);
@@ -84,9 +84,9 @@ static bool check_destory_item(player_type *creature_ptr, destroy_type *destroy_
 
 static bool select_destroying_item(player_type *creature_ptr, destroy_type *destroy_ptr)
 {
-    concptr q = _("\82Ç\82Ì\83A\83C\83e\83\80\82ð\89ó\82µ\82Ü\82·\82©? ", "Destroy which item? ");
-    concptr s = _("\89ó\82¹\82é\83A\83C\83e\83\80\82ð\8e\9d\82Á\82Ä\82¢\82È\82¢\81B", "You have nothing to destroy.");
-    destroy_ptr->o_ptr = choose_object(creature_ptr, &destroy_ptr->item, q, s, USE_INVEN | USE_FLOOR, 0);
+    concptr q = _("どのアイテムを壊しますか? ", "Destroy which item? ");
+    concptr s = _("壊せるアイテムを持っていない。", "You have nothing to destroy.");
+    destroy_ptr->o_ptr = choose_object(creature_ptr, &destroy_ptr->item, q, s, USE_INVEN | USE_FLOOR, TV_NONE);
     if (destroy_ptr->o_ptr == NULL)
         return FALSE;
 
@@ -101,10 +101,10 @@ static bool select_destroying_item(player_type *creature_ptr, destroy_type *dest
 }
 
 /*!
- * @brief \88ê\95\94\90E\8bÆ\82Å\8d\82\88Ê\96\82\96@\8f\91\82Ì\94j\89ó\82É\82æ\82é\8co\8c±\92l\8fã\8f¸\82Ì\94»\92è
- * @param creature_ptr \83v\83\8c\81[\83\84\81[\82Ö\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
- * @param destory_ptr \83A\83C\83e\83\80\94j\89ó\8d\\91¢\91Ì\82Ö\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
- * return \96\82\96@\8f\91\82Ì\94j\89ó\82É\82æ\82Á\82Ä\8co\8c±\92l\82ª\93ü\82é\82È\82ç\82ÎTRUE
+ * @brief 一部職業で高位魔法書の破壊による経験値上昇の判定
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @param destory_ptr アイテム破壊構造体への参照ポインタ
+ * return 魔法書の破壊によって経験値が入るならばTRUE
  */
 static bool decide_magic_book_exp(player_type *creature_ptr, destroy_type *destroy_ptr)
 {
@@ -145,7 +145,7 @@ static void gain_exp_by_destroying_magic_book(player_type *creature_ptr, destroy
     if (tester_exp < 1)
         tester_exp = 1;
 
-    msg_print(_("\8dX\82É\8co\8c±\82ð\90Ï\82ñ\82¾\82æ\82¤\82È\8bC\82ª\82·\82é\81B", "You feel more experienced."));
+    msg_print(_("更に経験を積んだような気がする。", "You feel more experienced."));
     gain_exp(creature_ptr, tester_exp * destroy_ptr->amt);
 }
 
@@ -175,7 +175,7 @@ static void process_destroy_magic_book(player_type *creature_ptr, destroy_type *
 static void exe_destroy_item(player_type *creature_ptr, destroy_type *destroy_ptr)
 {
     object_copy(destroy_ptr->q_ptr, destroy_ptr->o_ptr);
-    msg_format(_("%s\82ð\89ó\82µ\82½\81B", "You destroy %s."), destroy_ptr->o_name);
+    msg_format(_("%sを壊した。", "You destroy %s."), destroy_ptr->o_name);
     sound(SOUND_DESTITEM);
     reduce_charges(destroy_ptr->o_ptr, destroy_ptr->amt);
     vary_item(creature_ptr, destroy_ptr->item, -destroy_ptr->amt);
@@ -183,14 +183,14 @@ static void exe_destroy_item(player_type *creature_ptr, destroy_type *destroy_pt
     if ((destroy_ptr->q_ptr->to_a != 0) || (destroy_ptr->q_ptr->to_d != 0) || (destroy_ptr->q_ptr->to_h != 0))
         chg_virtue(creature_ptr, V_HARMONY, 1);
 
-    if (destroy_ptr->item >= INVEN_RARM)
+    if (destroy_ptr->item >= INVEN_MAIN_HAND)
         calc_android_exp(creature_ptr);
 }
 
 /*!
- * @brief \83A\83C\83e\83\80\82ð\94j\89ó\82·\82é\83R\83}\83\93\83h\82Ì\83\81\83C\83\93\83\8b\81[\83`\83\93 / Destroy an item
- * @param creature_ptr \83v\83\8c\81[\83\84\81[\82Ö\82Ì\8eQ\8fÆ\83|\83C\83\93\83^
- * @return \82È\82µ
+ * @brief アイテムを破壊するコマンドのメインルーチン / Destroy an item
+ * @param creature_ptr プレーヤーへの参照ポインタ
+ * @return なし
  */
 void do_cmd_destroy(player_type *creature_ptr)
 {
@@ -213,7 +213,7 @@ void do_cmd_destroy(player_type *creature_ptr)
     take_turn(creature_ptr, 100);
     if (!can_player_destroy_object(creature_ptr, destroy_ptr->o_ptr)) {
         free_turn(creature_ptr);
-        msg_format(_("%s\82Í\94j\89ó\95s\89Â\94\\82¾\81B", "You cannot destroy %s."), destroy_ptr->o_name);
+        msg_format(_("%sは破壊不可能だ。", "You cannot destroy %s."), destroy_ptr->o_name);
         return;
     }