Fix select_floor_music().

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

diff --git a/src/init1.c b/src/init1.c
index b012e54..b3c2309 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -1452,7 +1452,7 @@ errr parse_m_info(char *buf, header *head)
 /*!
  * @brief ¥Æ¥­¥¹¥È¥È¡¼¥¯¥ó¤òÁöºº¤·¤Æ¥Õ¥é¥°¤ò°ì¤ÄÆÀ¤ë(ÈÆÍÑ) /
  * Grab one flag from a textual string
- * @param flgs ¥Ó¥Ã¥È¥Õ¥é¥°¤òÄɲ乤ëÀè¤Î»²¾È¥Ý¥¤¥ó¥¿
+ * @param flags ¥Ó¥Ã¥È¥Õ¥é¥°¤òÄɲ乤ëÀè¤Î»²¾È¥Ý¥¤¥ó¥¿
  * @param names ¥È¡¼¥¯¥óÄêµÁÇÛÎó
  * @param what »²¾È¸µ¤Îʸ»úÎó¥Ý¥¤¥ó¥¿
  * @return ¥¨¥é¡¼¥³¡¼¥É
@@ -1858,7 +1858,7 @@ s16b f_tag_to_index(cptr str)
 /*!
  * @brief ÃÏ·Á¥¿¥°¤«¤éID¤òÆÀ¤ë /
  * Search for real index corresponding to this fake tag
- * @param str ¥¿¥°Ê¸»úÎó
+ * @param feat ¥¿¥°Ê¸»úÎó
  * @return ¤Ê¤·
  */
 static void search_real_feat(s16b *feat)
@@ -2727,7 +2727,7 @@ errr parse_e_info(char *buf, header *head)
 /*!
  * @brief ¥Æ¥­¥¹¥È¥È¡¼¥¯¥ó¤òÁöºº¤·¤Æ¥Õ¥é¥°¤ò°ì¤ÄÆÀ¤ë(¥â¥ó¥¹¥¿¡¼ÍÑ1) /
  * Grab one (basic) flag in a monster_race from a textual string
- * @param e_ptr ÊÝ´ÉÀè¤Î¥â¥ó¥¹¥¿¡¼¼ï²¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
+ * @param r_ptr ÊÝ´ÉÀè¤Î¥â¥ó¥¹¥¿¡¼¼ï²¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
  * @param what »²¾È¸µ¤Îʸ»úÎó¥Ý¥¤¥ó¥¿
  * @return ¥¨¥é¡¼¥³¡¼¥É
  */
@@ -2770,7 +2770,7 @@ static errr grab_one_basic_flag(monster_race *r_ptr, cptr what)
 /*!
  * @brief ¥Æ¥­¥¹¥È¥È¡¼¥¯¥ó¤òÁöºº¤·¤Æ¥Õ¥é¥°¤ò°ì¤ÄÆÀ¤ë(¥â¥ó¥¹¥¿¡¼ÍÑ2) /
  * Grab one (spell) flag in a monster_race from a textual string
- * @param e_ptr ÊÝ´ÉÀè¤Î¥â¥ó¥¹¥¿¡¼¼ï²¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
+ * @param r_ptr ÊÝ´ÉÀè¤Î¥â¥ó¥¹¥¿¡¼¼ï²¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
  * @param what »²¾È¸µ¤Îʸ»úÎó¥Ý¥¤¥ó¥¿
  * @return ¥¨¥é¡¼¥³¡¼¥É
  */
@@ -3104,8 +3104,12 @@ errr parse_r_info(char *buf, header *head)
 }
 
 
-/*
+/*!
+ * @brief ¥Æ¥­¥¹¥È¥È¡¼¥¯¥ó¤òÁöºº¤·¤Æ¥Õ¥é¥°¤ò°ì¤ÄÆÀ¤ë(¥À¥ó¥¸¥ç¥óÍÑ) /
  * Grab one flag for a dungeon type from a textual string
+ * @param d_ptr ÊÝ´ÉÀè¤Î¥À¥ó¥¸¥ç¥ó¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
+ * @param what »²¾È¸µ¤Îʸ»úÎó¥Ý¥¤¥ó¥¿
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 static errr grab_one_dungeon_flag(dungeon_info_type *d_ptr, cptr what)
 {
@@ -3123,8 +3127,12 @@ static errr grab_one_dungeon_flag(dungeon_info_type *d_ptr, cptr what)
        return (1);
 }
 
-/*
+/*!
+ * @brief ¥Æ¥­¥¹¥È¥È¡¼¥¯¥ó¤òÁöºº¤·¤Æ¥Õ¥é¥°¤ò°ì¤ÄÆÀ¤ë(¥â¥ó¥¹¥¿¡¼¤Î¥À¥ó¥¸¥ç¥ó½Ð¸½¾ò·ïÍÑ1) /
  * Grab one (basic) flag in a monster_race from a textual string
+ * @param d_ptr ÊÝ´ÉÀè¤Î¥À¥ó¥¸¥ç¥ó¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
+ * @param what »²¾È¸µ¤Îʸ»úÎó¥Ý¥¤¥ó¥¿
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 static errr grab_one_basic_monster_flag(dungeon_info_type *d_ptr, cptr what)
 {
@@ -3160,8 +3168,12 @@ static errr grab_one_basic_monster_flag(dungeon_info_type *d_ptr, cptr what)
 }
 
 
-/*
+/*!
+ * @brief ¥Æ¥­¥¹¥È¥È¡¼¥¯¥ó¤òÁöºº¤·¤Æ¥Õ¥é¥°¤ò°ì¤ÄÆÀ¤ë(¥â¥ó¥¹¥¿¡¼¤Î¥À¥ó¥¸¥ç¥ó½Ð¸½¾ò·ïÍÑ2) /
  * Grab one (spell) flag in a monster_race from a textual string
+ * @param d_ptr ÊÝ´ÉÀè¤Î¥À¥ó¥¸¥ç¥ó¹½Â¤Âλ²¾È¥Ý¥¤¥ó¥¿
+ * @param what »²¾È¸µ¤Îʸ»úÎó¥Ý¥¤¥ó¥¿
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 static errr grab_one_spell_monster_flag(dungeon_info_type *d_ptr, cptr what)
 {
@@ -3185,8 +3197,12 @@ static errr grab_one_spell_monster_flag(dungeon_info_type *d_ptr, cptr what)
        return (1);
 }
 
-/*
+/*!
+ * @brief ¥À¥ó¥¸¥ç¥ó¾ðÊó(d_info)¤Î¥Ñ¡¼¥¹´Ø¿ô /
  * Initialize the "d_info" array, by parsing an ascii "template" file
+ * @param buf ¥Æ¥­¥¹¥ÈÎó
+ * @param head ¥Ø¥Ã¥À¹½Â¤ÂÎ
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 errr parse_d_info(char *buf, header *head)
 {
@@ -3551,8 +3567,11 @@ struct dungeon_grid
 static dungeon_grid letter[255];
 
 
-/*
+/*!
+ * @brief ÃÏ·Á¾ðÊó¤Î¡ÖF:¡×¾ðÊó¤ò¥Ñ¡¼¥¹¤¹¤ë
  * Process "F:<letter>:<terrain>:<cave_info>:<monster>:<object>:<ego>:<artifact>:<trap>:<special>" -- info for dungeon grid
+ * @param buf ²òÀÏʸ»úÎó
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 static errr parse_line_feature(char *buf)
 {
@@ -3697,8 +3716,11 @@ static errr parse_line_feature(char *buf)
 }
 
 
-/*
+/*!
+ * @brief ÃÏ·Á¾ðÊó¤Î¡ÖB:¡×¾ðÊó¤ò¥Ñ¡¼¥¹¤¹¤ë
  * Process "B:<Index>:<Command>:..." -- Building definition
+ * @param buf ²òÀÏʸ»úÎó
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 static errr parse_line_building(char *buf)
 {
@@ -3850,8 +3872,13 @@ static errr parse_line_building(char *buf)
 }
 
 
-/*
+/*!
+ * @brief ¥Õ¥í¥¢¤Î½êÄê¤Î¥Þ¥¹¤Ë¥ª¥Ö¥¸¥§¥¯¥È¤òÇÛÃÖ¤¹¤ë
  * Place the object j_ptr to a grid
+ * @param j_ptr ¥ª¥Ö¥¸¥§¥¯¥È¹½Â¤ÂΤλ²¾È¥Ý¥¤¥ó¥¿
+ * @param y ÇÛÃÖÀèYºÂɸ
+ * @param x ÇÛÃÖÀèXºÂɸ
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 static void drop_here(object_type *j_ptr, int y, int x)
 {
@@ -3883,8 +3910,17 @@ static void drop_here(object_type *j_ptr, int y, int x)
 }
 
 
-/*
+/*!
+ * @brief ¥¯¥¨¥¹¥ÈÍѸÇÄê¥À¥ó¥¸¥ç¥ó¤ò¥Õ¥í¥¢¤ËÀ¸À®¤¹¤ë
  * Parse a sub-file of the "extra info"
+ * @param buf ʸ»úÎó
+ * @param ymin ¾ÜºÙÉÔÌÀ
+ * @param xmin ¾ÜºÙÉÔÌÀ
+ * @param ymax ¾ÜºÙÉÔÌÀ
+ * @param xmax ¾ÜºÙÉÔÌÀ
+ * @param y ¾ÜºÙÉÔÌÀ
+ * @param x ¾ÜºÙÉÔÌÀ
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, int xmax, int *y, int *x)
 {
@@ -4367,8 +4403,12 @@ static char tmp[8];
 static cptr variant = "ZANGBAND";
 
 
-/*
+/*!
+ * @brief ¥¯¥¨¥¹¥ÈÍѸÇÄê¥À¥ó¥¸¥ç¥óÀ¸À®»þ¤Îʬ´ô½èÍý
  * Helper function for "process_dungeon_file()"
+ * @param sp
+ * @param fp
+ * @return ¥¨¥é¡¼¥³¡¼¥É
  */
 static cptr process_dungeon_file_expr(char **sp, char *fp)
 {
@@ -4700,6 +4740,16 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
 }
 
 
+/*!
+ * @brief ¥¯¥¨¥¹¥ÈÍѸÇÄê¥À¥ó¥¸¥ç¥óÀ¸À®»þ¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó
+ * Helper function for "process_dungeon_file()"
+ * @param name ¥Õ¥¡¥¤¥ë̾
+ * @param ymin ¾ÜºÙÉÔÌÀ
+ * @param xmin ¾ÜºÙÉÔÌÀ
+ * @param ymax ¾ÜºÙÉÔÌÀ
+ * @param xmax ¾ÜºÙÉÔÌÀ
+ * @return ¥¨¥é¡¼¥³¡¼¥É
+ */
 errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax)
 {
        FILE *fp;