From e24a5f85424cdb4c9a76fb25396d85824876eff4 Mon Sep 17 00:00:00 2001 From: deskull Date: Sat, 18 Jan 2014 03:57:08 +0000 Subject: [PATCH] Fix some comment warnings. --- src/cave.c | 6 ++---- src/flavor.c | 2 +- src/object1.c | 15 +++++++-------- src/object2.c | 8 ++++---- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/cave.c b/src/cave.c index 5127ece97..179df4894 100644 --- a/src/cave.c +++ b/src/cave.c @@ -119,7 +119,7 @@ bool is_hidden_door(cave_type *c_ptr) * @param y2 ½ªÅÀ¤ÎyºÂɸ * @param x2 ½ªÅÀ¤ÎxºÂɸ * @return LOS¤¬Ä̤äƤ¤¤ë¤Ê¤éTRUE¤òÊÖ¤¹¡£ - * @detail + * @details * A simple, fast, integer-based line-of-sight algorithm. By Joseph Hall,\n * 4116 Brewster Drive, Raleigh NC 27606. Email to jnh@ecemwl.ncsu.edu.\n *\n @@ -532,7 +532,7 @@ void update_local_illumination(int y, int x) /*! * @brief »ØÄꤵ¤ì¤¿ºÂɸ¤ò¥×¥ì¥¤¥ä¡¼¤¬»ë³Ð¤Ë¼ý¤á¤é¤ì¤ë¤«¤òÊÖ¤¹¡£ / Can the player "see" the given grid in detail? * @param y yºÂɸ - * @param y xºÂɸ + * @param x xºÂɸ * @return »ë³Ð¤Ë¼ý¤á¤é¤ì¤ë¾õÂ֤ʤéTRUE¤òÊÖ¤¹ * @details * He must have vision, illumination, and line of sight.\n @@ -596,8 +596,6 @@ bool player_can_see_bold(int y, int x) /*! * @brief »ØÄꤵ¤ì¤¿ºÂɸ¤ò¥×¥ì¥¤¥ä¡¼¼ý¤á¤é¤ì¤Æ¤¤¤Ê¤¤¾õÂÖ¤«¤É¤¦¤« / Returns true if the player's grid is dark - * @param y yºÂɸ - * @param x xºÂɸ * @return »ë³Ð¤Ë¼ý¤á¤é¤ì¤Æ¤¤¤Ê¤¤¤Ê¤éTRUE¤òÊÖ¤¹ * @details player_can_see_bold()´Ø¿ô¤ÎÊÖ¤êÃͤÎÈÝÄê¤òÊÖ¤·¤Æ¤¤¤ë¡£ */ diff --git a/src/flavor.c b/src/flavor.c index fe54927c6..6657bfa23 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -386,7 +386,7 @@ static char *object_desc_chr(char *t, char c) * @brief ÂоÝʸ»úÇÛÎó¤Ëʸ»úÎó¤ò¥³¥Ô¡¼¤¹¤ë¡£ * @param t ÊÝ´ÉÀèʸ»úÎó¥Ý¥¤¥ó¥¿ * @param c ¥³¥Ô¡¼¤·¤¿¤¤Ê¸»úÎó¥Ý¥¤¥ó¥¿ - * @return ¤Ê¤· + * @return ÊÝ´ÉÀè¤ÎËöÈø¥¢¥É¥ì¥¹ * @details * Print a string "s" into a string "t", as if by strcpy(t, s), * and return a pointer to the terminator. diff --git a/src/object1.c b/src/object1.c index 176b64c6f..033d6a526 100644 --- a/src/object1.c +++ b/src/object1.c @@ -2552,7 +2552,7 @@ void display_equip(void) * @param tag ³ºÅö¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤¬¤¢¤ë¤«¤òÄ´¤Ù¤¿¤¤¥¿¥° * @param mode ½ê»ý¡¢ÁõÈ÷¤ÎÀÚ¤êÂؤ¨ * @return ¥¿¥°¤Ë³ºÅö¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤¬¤¢¤ë¤Ê¤éTRUE¤òÊÖ¤¹ - * @detail + * @details * A "tag" is a numeral "n" appearing as "@n" anywhere in the\n * inscription of an object. Alphabetical characters don't work as a\n * tag in this form.\n @@ -2677,7 +2677,7 @@ static bool get_tag(int *cp, char tag, int mode) * @param floor_list ¾²¾å¥¢¥¤¥Æ¥à¤ÎÇÛÎó * @param floor_num ¾²¾å¥¢¥¤¥Æ¥à¤ÎÇÛÎóID * @return ¥¿¥°¤Ë³ºÅö¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤¬¤¢¤ë¤Ê¤éTRUE¤òÊÖ¤¹ - * @detail + * @details * A "tag" is a numeral "n" appearing as "@n" anywhere in the\n * inscription of an object. Alphabetical characters don't work as a\n * tag in this form.\n @@ -3306,7 +3306,7 @@ static bool verify(cptr prompt, int item) /*! * @brief ÁªÂò¤·¤¿¥¢¥¤¥Æ¥à¤Î³Îǧ½èÍý¤Î¥á¥¤¥ó¥ë¡¼¥Á¥ó / - * @praram item ÁªÂò¥¢¥¤¥Æ¥àID + * @param item ÁªÂò¥¢¥¤¥Æ¥àID * @return ³Îǧ¤¬Yes¤Ê¤éTRUE¤òÊÖ¤¹¡£ * @details The item can be negative to mean "item on floor". * Hack -- allow user to "prevent" certain choices @@ -3364,7 +3364,7 @@ if (!verify(" /*! * @brief ¥×¥ì¥¤¥ä¡¼¤Î½ê»ý/ÁõÈ÷¥ª¥Ö¥¸¥§¥¯¥È¤¬Àµµ¬¤Î¤â¤Î¤«¤òÊÖ¤¹ / * Auxiliary function for "get_item()" -- test an index - * @param item ÁªÂò¥¢¥¤¥Æ¥àID + * @param i ÁªÂò¥¢¥¤¥Æ¥àID * @return Àµµ¬¤ÎID¤Ê¤é¤ÐTRUE¤òÊÖ¤¹¡£ */ static bool get_item_okay(int i) @@ -3384,7 +3384,6 @@ static bool get_item_okay(int i) /*! * @brief ¥×¥ì¥¤¥ä¡¼¤¬¥ª¥Ö¥¸¥§¥¯¥È¤ò½¦¤¦¤³¤È¤¬¤Ç¤­¤ë¾õÂÖ¤«¤òÊÖ¤¹ / * Determine whether get_item() can get some item or not - * @param item ÁªÂò¥¢¥¤¥Æ¥àID * @return ¥¢¥¤¥Æ¥à¤ò½¦¤¨¤ë¤Ê¤é¤ÐTRUE¤òÊÖ¤¹¡£ * @details assuming mode = (USE_EQUIP | USE_INVEN | USE_FLOOR). */ @@ -3409,7 +3408,7 @@ bool can_get_item(void) * @param cp ÁªÂò¤·¤¿¥ª¥Ö¥¸¥§¥¯¥È¤ÎID¤òÊÖ¤¹¡£ * @param pmt ÁªÂòÌÜŪ¤Î¥á¥Ã¥»¡¼¥¸ * @param str ÁªÂò¤Ç¤­¤ë¥ª¥Ö¥¸¥§¥¯¥È¤¬¤Ê¤¤¾ì¹ç¤Î¥­¥ã¥ó¥»¥ë¥á¥Ã¥»¡¼¥¸ - * @praram mode ¥ª¥×¥·¥ç¥ó¥Õ¥é¥° + * @param mode ¥ª¥×¥·¥ç¥ó¥Õ¥é¥° * @return ¥×¥ì¥¤¥ä¡¼¤Ë¤è¤ê¥¢¥¤¥Æ¥à¤¬ÁªÂò¤µ¤ì¤¿¤Ê¤éTRUE¤òÊÖ¤¹¡£/ * Return TRUE only if an acceptable item was chosen by the user.\n * @details @@ -4540,7 +4539,7 @@ int show_floor(int target_item, int y, int x, int *min_width) * @param cp ÁªÂò¤·¤¿¥ª¥Ö¥¸¥§¥¯¥È¤ÎID¤òÊÖ¤¹¡£ * @param pmt ÁªÂòÌÜŪ¤Î¥á¥Ã¥»¡¼¥¸ * @param str ÁªÂò¤Ç¤­¤ë¥ª¥Ö¥¸¥§¥¯¥È¤¬¤Ê¤¤¾ì¹ç¤Î¥­¥ã¥ó¥»¥ë¥á¥Ã¥»¡¼¥¸ - * @praram mode ¥ª¥×¥·¥ç¥ó¥Õ¥é¥° + * @param mode ¥ª¥×¥·¥ç¥ó¥Õ¥é¥° * @return ¥×¥ì¥¤¥ä¡¼¤Ë¤è¤ê¥¢¥¤¥Æ¥à¤¬ÁªÂò¤µ¤ì¤¿¤Ê¤éTRUE¤òÊÖ¤¹¡£/ */ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode) @@ -5868,7 +5867,7 @@ static bool py_pickup_floor_aux(void) /*! * @brief ¾²¾å¤Î¥¢¥¤¥Æ¥à¤ò½¦¤¦¥á¥¤¥ó½èÍý - * @param pick FALSE¤Ê¤é¶âÁ¬¤Î¼«Æ°½¦¤¤¤Î¤ß¤ò¹Ô¤¦/ FALSE then only gold will be picked up + * @param pickup FALSE¤Ê¤é¶âÁ¬¤Î¼«Æ°½¦¤¤¤Î¤ß¤ò¹Ô¤¦/ FALSE then only gold will be picked up * @return ¤Ê¤· * @details * This is called by py_pickup() when easy_floor is TRUE. diff --git a/src/object2.c b/src/object2.c index 2729dd4a6..e88b97370 100644 --- a/src/object2.c +++ b/src/object2.c @@ -318,7 +318,7 @@ static void compact_objects_aux(int i1, int i2) /*! * @brief ¥°¥í¡¼¥Ð¥ë¥ª¥Ö¥¸¥§¥¯¥ÈÇÛÎ󤫤éÍ¥ÀèÅÙ¤ÎÄ㤤¤â¤Î¤òºï½ü¤·¡¢¥Ç¡¼¥¿¤ò°µ½Ì¤¹¤ë¡£ / * Compact and Reorder the object list. - * @size ºÇÄã¤Ç¤â¸º¤é¤·¤¿¤¤¥ª¥Ö¥¸¥§¥¯¥È¿ô¤Î¿å½à + * @param size ºÇÄã¤Ç¤â¸º¤é¤·¤¿¤¤¥ª¥Ö¥¸¥§¥¯¥È¿ô¤Î¿å½à * @return ¤Ê¤· * @details * ¡Ê´í¸±¤Ê¤Î¤Ç»ÈÍѤˤÏÃí°Õ¤¹¤ë¤³¤È¡Ë @@ -616,7 +616,7 @@ static errr get_obj_num_prep(void) /*! * @brief ¥ª¥Ö¥¸¥§¥¯¥ÈÀ¸À®¥Æ¡¼¥Ö¥ë¤«¤é¥¢¥¤¥Æ¥à¤ò¼èÆÀ¤¹¤ë / * Choose an object kind that seems "appropriate" to the given level - * @param À¸À®³¬ + * @param level À¸À®³¬ * @return Áª¤Ð¤ì¤¿¥ª¥Ö¥¸¥§¥¯¥È¥Ù¡¼¥¹ID * @details * This function uses the "prob2" field of the "object allocation table",\n @@ -5615,8 +5615,8 @@ amuse_type amuse_info[] = /*! * @brief ïÆÀ¥É¥í¥Ã¥×¤ò¹Ô¤¦¡£ - * @param y ÇÛÃÖ¤·¤¿¤¤¥Õ¥í¥¢¤ÎYºÂɸ - * @param x ÇÛÃÖ¤·¤¿¤¤¥Õ¥í¥¢¤ÎXºÂɸ + * @param y1 ÇÛÃÖ¤·¤¿¤¤¥Õ¥í¥¢¤ÎYºÂɸ + * @param x1 ÇÛÃÖ¤·¤¿¤¤¥Õ¥í¥¢¤ÎXºÂɸ * @param num ïÆÀ¤Î½èÍý²ó¿ô * @param known TRUE¤Ê¤é¤Ð¥ª¥Ö¥¸¥§¥¯¥È¤¬É¬¤º¡ö´ÕÄê¡öºÑ¤Ë¤Ê¤ë * @return ¤Ê¤· -- 2.11.0