X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd4.c;h=1ba5d6da090a6bc6c927b459edb98a86390e25b8;hb=acfedf5b4b5fac4863648d12c38bd5267bb7e5a3;hp=5975865d9e5ac92712754dcf7ecbe5d2e0e696b7;hpb=7fc0978157c753917d0d63aa5b223bca43e811f8;p=hengband%2Fhengband.git

diff --git a/src/cmd4.c b/src/cmd4.c
index 5975865d9..1ba5d6da0 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -2593,7 +2593,7 @@ static errr keymap_dump(cptr fname)
 	char key[1024];
 	char buf[1024];
 
-	int mode;
+	BIT_FLAGS mode;
 
 	/* Roguelike */
 	if (rogue_like_commands)
@@ -2671,7 +2671,7 @@ void do_cmd_macros(void)
 
 	char buf[1024];
 
-	int mode;
+	BIT_FLAGS mode;
 
 
 	/* Roguelike */
@@ -6179,7 +6179,7 @@ static void do_cmd_knowledge_kill_count(void)
 			}
 			else
 			{
-				s16b This = r_ptr->r_pkills;
+				MONSTER_NUMBER This = r_ptr->r_pkills;
 
 				if (This > 0)
 				{
@@ -6235,16 +6235,16 @@ static void do_cmd_knowledge_kill_count(void)
 		}
 		else
 		{
-			s16b This = r_ptr->r_pkills;
+			MONSTER_NUMBER This = r_ptr->r_pkills;
 
 			if (This > 0)
 			{
 #ifdef JP
 				/* p,tは人と数える by ita */
 				if (my_strchr("pt", r_ptr->d_char))
-					fprintf(fff, "     %3d 人の %s\n", This, r_name + r_ptr->name);
+					fprintf(fff, "     %3d 人の %s\n", (int)This, r_name + r_ptr->name);
 				else
-					fprintf(fff, "     %3d 体の %s\n", This, r_name + r_ptr->name);
+					fprintf(fff, "     %3d 体の %s\n", (int)This, r_name + r_ptr->name);
 #else
 				if (This < 2)
 				{
@@ -8143,13 +8143,13 @@ static void do_cmd_knowledge_quests_current(FILE *fff)
 #ifdef JP
 						sprintf(rand_tmp_str,"  %s (%d 階) - %d 体の%sを倒す。(あと %d 体)\n",
 							quest[i].name, (int)quest[i].level,
-							quest[i].max_num, name, quest[i].max_num - quest[i].cur_num);
+							(int)quest[i].max_num, name, (int)(quest[i].max_num - quest[i].cur_num));
 #else
 						plural_aux(name);
 
 						sprintf(rand_tmp_str,"  %s (Dungeon level: %d)\n  Kill %d %s, have killed %d.\n",
-							quest[i].name, (idx)quest[i].level,
-							quest[i].max_num, name, quest[i].cur_num);
+							quest[i].name, (int)quest[i].level,
+							(int)quest[i].max_num, name, (int)quest[i].cur_num);
 #endif
 					}
 					else
@@ -8312,7 +8312,7 @@ static void do_cmd_knowledge_quests_wiz_random(FILE *fff)
 
 bool ang_sort_comp_quest_num(vptr u, vptr v, int a, int b)
 {
-	int *q_num = (int *)u;
+	QUEST_IDX *q_num = (QUEST_IDX *)u;
 	quest_type *qa = &quest[q_num[a]];
 	quest_type *qb = &quest[q_num[b]];
 
@@ -8324,8 +8324,8 @@ bool ang_sort_comp_quest_num(vptr u, vptr v, int a, int b)
 
 void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b)
 {
-	int *q_num = (int *)u;
-	int tmp;
+	QUEST_IDX *q_num = (QUEST_IDX *)u;
+	QUEST_IDX tmp;
 
 	/* Unused */
 	(void)v;