OSDN Git Service

変数の型違いによる警告を除去。既知のアイテムリストで1つも既知でないときに思い出を見ると空のアイテムの思い出を表示してたのを修正。
authoriks <iks@0568b783-4c39-0410-ac80-bf13821ea2a2>
Thu, 21 Nov 2002 07:58:20 +0000 (07:58 +0000)
committeriks <iks@0568b783-4c39-0410-ac80-bf13821ea2a2>
Thu, 21 Nov 2002 07:58:20 +0000 (07:58 +0000)
src/cmd4.c

index b43459a..c285534 100644 (file)
@@ -5004,7 +5004,7 @@ static int collect_monsters(int grp_cur, s16b mon_idx[], byte mode)
                monster_race *r_ptr = &r_info[i];
 
                /* Is this a unique? */
-               bool unique = (r_ptr->flags1 & (RF1_UNIQUE)) ;
+               bool unique = (bool)(r_ptr->flags1 & (RF1_UNIQUE)) ;
 
                /* Skip empty race */
                if (!r_ptr->name) continue ;
@@ -7379,7 +7379,7 @@ static void display_monster_list(int col, int row, int per_page, s16b mon_idx[],
                monster_race *r_ptr = &r_info[r_idx];
 
                /* Is this a unique? */
-               bool unique = (r_ptr->flags1 & (RF1_UNIQUE)) ;
+               bool unique = (bool)(r_ptr->flags1 & (RF1_UNIQUE)) ;
 
                /* Choose a color */
                attr = ((i + mon_top == mon_cur) ? TERM_L_BLUE : TERM_WHITE);
@@ -7802,7 +7802,8 @@ static void do_cmd_knowledge_objects(void)
                        case 'r':
                        {
                                /* Recall on screen */
-                               desc_obj_fake(object_idx[object_cur]);
+                               if (grp_cnt > 0)
+                                       desc_obj_fake(object_idx[object_cur]);
 
                                redraw = TRUE;
                                break;