X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fbldg.c;h=7ccb4b528347afcb0f960a78ba7bc360529fceaf;hb=cfd1541a4984bea6918980c94e3f87126201ae38;hp=d8f3a5217e71663081834017809f0c6775a8b344;hpb=490edb11f6fb8b35222ea164adb7239783e75518;p=hengband%2Fhengband.git

diff --git a/src/bldg.c b/src/bldg.c
index d8f3a5217..7ccb4b528 100644
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -129,9 +129,9 @@ static void show_building(building_type* bldg)
 				{
 					action_color = TERM_YELLOW;
 #ifdef JP
-sprintf(buff, "($%ld)", bldg->member_costs[i]);
+sprintf(buff, "($%ld)", (long int)bldg->member_costs[i]);
 #else
-					sprintf(buff, "(%ldgp)", bldg->member_costs[i]);
+					sprintf(buff, "(%ldgp)", (long int)bldg->member_costs[i]);
 #endif
 
 				}
@@ -139,9 +139,9 @@ sprintf(buff, "($%ld)", bldg->member_costs[i]);
 				{
 					action_color = TERM_YELLOW;
 #ifdef JP
-sprintf(buff, "($%ld)", bldg->other_costs[i]);
+sprintf(buff, "($%ld)", (long int)bldg->other_costs[i]);
 #else
-					sprintf(buff, "(%ldgp)", bldg->other_costs[i]);
+					sprintf(buff, "(%ldgp)", (long int)bldg->other_costs[i]);
 #endif
 
 				}
@@ -168,9 +168,9 @@ strcpy(buff, "(
 				{
 					action_color = TERM_YELLOW;
 #ifdef JP
-sprintf(buff, "($%ld)", bldg->member_costs[i]);
+sprintf(buff, "($%ld)", (long int)bldg->member_costs[i]);
 #else
-					sprintf(buff, "(%ldgp)", bldg->member_costs[i]);
+					sprintf(buff, "(%ldgp)", (long int)bldg->member_costs[i]);
 #endif
 
 				}
@@ -178,9 +178,9 @@ sprintf(buff, "($%ld)", bldg->member_costs[i]);
 				{
 					action_color = TERM_YELLOW;
 #ifdef JP
-sprintf(buff, "($%ld)", bldg->other_costs[i]);
+sprintf(buff, "($%ld)", (long int)bldg->other_costs[i]);
 #else
-					sprintf(buff, "(%ldgp)", bldg->other_costs[i]);
+					sprintf(buff, "(%ldgp)", (long int)bldg->other_costs[i]);
 #endif
 
 				}
@@ -201,9 +201,9 @@ strcpy(buff, "(
 				{
 					action_color = TERM_YELLOW;
 #ifdef JP
-sprintf(buff, "($%ld)", bldg->member_costs[i]);
+sprintf(buff, "($%ld)", (long int)bldg->member_costs[i]);
 #else
-					sprintf(buff, "(%ldgp)", bldg->member_costs[i]);
+					sprintf(buff, "(%ldgp)", (long int)bldg->member_costs[i]);
 #endif
 
 				}
@@ -281,7 +281,14 @@ msg_print("
 #else
 					if (get_check("Do you fight? "))
 #endif
-					{
+					{	
+#ifdef JP
+                        msg_print("»à¤Ì¤¬¤è¤¤¡£");
+#else
+					    msg_print("Die, maggots.");
+#endif
+						msg_print(NULL);
+					
 						p_ptr->exit_bldg = FALSE;
 						reset_tim_flags();
 
@@ -1270,9 +1277,9 @@ static bool gamble_comm(int cmd)
 		/* Get the wager */
 		strcpy(out_val, "");
 #ifdef JP
-sprintf(tmp_str,"ÅÒ¤±¶â (1-%ld)¡©", maxbet);
+sprintf(tmp_str,"ÅÒ¤±¶â (1-%ld)¡©", (long int)maxbet);
 #else
-		sprintf(tmp_str,"Your wager (1-%ld) ? ", maxbet);
+		sprintf(tmp_str,"Your wager (1-%ld) ? ", (long int)maxbet);
 #endif
 
 
@@ -1280,7 +1287,7 @@ sprintf(tmp_str,"
 		 * Use get_string() because we may need more than
 		 * the s16b value returned by get_quantity().
 		 */
-		if (get_string(tmp_str, out_val, 32, TRUE))
+		if (get_string(tmp_str, out_val, 32))
 		{
 			/* Strip spaces */
 			for (p = out_val; *p == ' '; p++);
@@ -1303,9 +1310,9 @@ msg_print("
 			else if (wager > maxbet)
 			{
 #ifdef JP
-msg_format("%ld¥´¡¼¥ë¥É¤À¤±¼õ¤±¤è¤¦¡£»Ä¤ê¤Ï¼è¤Ã¤È¤­¤Ê¡£", maxbet);
+msg_format("%ld¥´¡¼¥ë¥É¤À¤±¼õ¤±¤è¤¦¡£»Ä¤ê¤Ï¼è¤Ã¤È¤­¤Ê¡£", (long int)maxbet);
 #else
-				msg_format("I'll take %ld gold of that. Keep the rest.", maxbet);
+				msg_format("I'll take %ld gold of that. Keep the rest.", (long int)maxbet);
 #endif
 
 				wager = maxbet;
@@ -1327,17 +1334,17 @@ msg_print("
 			oldgold = p_ptr->au;
 
 #ifdef JP
-sprintf(tmp_str, "¥²¡¼¥àÁ°¤Î½ê»ý¶â: %9ld", oldgold);
+sprintf(tmp_str, "¥²¡¼¥àÁ°¤Î½ê»ý¶â: %9ld", (long int)oldgold);
 #else
-			sprintf(tmp_str, "Gold before game: %9ld", oldgold);
+			sprintf(tmp_str, "Gold before game: %9ld", (long int)oldgold);
 #endif
 
 			prt(tmp_str, 20, 2);
 
 #ifdef JP
-sprintf(tmp_str, "¸½ºß¤Î³Ý¤±¶â:     %9ld", wager);
+sprintf(tmp_str, "¸½ºß¤Î³Ý¤±¶â:     %9ld", (long int)wager);
 #else
-			sprintf(tmp_str, "Current Wager:    %9ld", wager);
+			sprintf(tmp_str, "Current Wager:    %9ld", (long int)wager);
 #endif
 
 			prt(tmp_str, 21, 2);
@@ -1453,9 +1460,9 @@ c_put_str(TERM_GREEN, "
 					prt("--------------------------------", 8, 3);
 					strcpy(out_val, "");
 #ifdef JP
-					get_string("²¿ÈÖ¡© (0-9): ", out_val, 32, TRUE);
+get_string("²¿ÈÖ¡© (0-9): ", out_val, 32);
 #else
-					get_string("Pick a number (0-9): ", out_val, 32, TRUE);
+					get_string("Pick a number (0-9): ", out_val, 32);
 #endif
 
 					for (p = out_val; isspace(*p); p++);
@@ -1606,9 +1613,9 @@ prt("
 					prt("", 17, 37);
 				}
 #ifdef JP
-sprintf(tmp_str, "¸½ºß¤Î½ê»ý¶â:     %9ld", p_ptr->au);
+sprintf(tmp_str, "¸½ºß¤Î½ê»ý¶â:     %9ld", (long int)p_ptr->au);
 #else
-				sprintf(tmp_str, "Current Gold:     %9ld", p_ptr->au);
+				sprintf(tmp_str, "Current Gold:     %9ld", (long int)p_ptr->au);
 #endif
 
 				prt(tmp_str, 22, 2);
@@ -1960,9 +1967,9 @@ static bool kakutoujou(void)
 			monster_race *r_ptr = &r_info[battle_mon[i]];
 
 #ifdef JP
-			sprintf(buf,"%d) %-58s  %4ld.%02ldÇÜ", i+1, format("%s%s",r_name + r_ptr->name, (r_ptr->flags1 & RF1_UNIQUE) ? "¤â¤É¤­" : "      "), mon_odds[i]/100, mon_odds[i]%100);
+			sprintf(buf,"%d) %-58s  %4ld.%02ldÇÜ", i+1, format("%s%s",r_name + r_ptr->name, (r_ptr->flags1 & RF1_UNIQUE) ? "¤â¤É¤­" : "      "), (long int)mon_odds[i]/100, (long int)mon_odds[i]%100);
 #else
-			sprintf(buf,"%d) %-58s  %4ld.%02ld", i+1, format("%s%s", (r_ptr->flags1 & RF1_UNIQUE) ? "Fake " : "", r_name + r_ptr->name), mon_odds[i]/100, mon_odds[i]%100);
+			sprintf(buf,"%d) %-58s  %4ld.%02ld", i+1, format("%s%s", (r_ptr->flags1 & RF1_UNIQUE) ? "Fake " : "", r_name + r_ptr->name), (long int)mon_odds[i]/100, (long int)mon_odds[i]%100);
 #endif
 			prt(buf, 5+i, 1);
 		}
@@ -2002,9 +2009,9 @@ static bool kakutoujou(void)
 		/* Get the wager */
 		strcpy(out_val, "");
 #ifdef JP
-sprintf(tmp_str,"ÅÒ¤±¶â (1-%ld)¡©", maxbet);
+sprintf(tmp_str,"ÅÒ¤±¶â (1-%ld)¡©", (long int)maxbet);
 #else
-		sprintf(tmp_str,"Your wager (1-%ld) ? ", maxbet);
+		sprintf(tmp_str,"Your wager (1-%ld) ? ", (long int)maxbet);
 #endif
 
 
@@ -2012,7 +2019,7 @@ sprintf(tmp_str,"
 		 * Use get_string() because we may need more than
 		 * the s16b value returned by get_quantity().
 		 */
-		if (get_string(tmp_str, out_val, 32, TRUE))
+		if (get_string(tmp_str, out_val, 32))
 		{
 			/* Strip spaces */
 			for (p = out_val; *p == ' '; p++);
@@ -2035,9 +2042,9 @@ msg_print("
 			else if (wager > maxbet)
 			{
 #ifdef JP
-msg_format("%ld¥´¡¼¥ë¥É¤À¤±¼õ¤±¤è¤¦¡£»Ä¤ê¤Ï¼è¤Ã¤È¤­¤Ê¡£", maxbet);
+msg_format("%ld¥´¡¼¥ë¥É¤À¤±¼õ¤±¤è¤¦¡£»Ä¤ê¤Ï¼è¤Ã¤È¤­¤Ê¡£", (long int)maxbet);
 #else
-				msg_format("I'll take %ld gold of that. Keep the rest.", maxbet);
+				msg_format("I'll take %ld gold of that. Keep the rest.",(long int) maxbet);
 #endif
 
 				wager = maxbet;
@@ -2238,9 +2245,9 @@ static bool kankin(void)
 			if (get_check(buf))
 			{
 #ifdef JP
-				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", 1000000L * o_ptr->number);
+				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", (long int)(1000000L * o_ptr->number));
 #else
-				msg_format("You get %ldgp.", 1000000L * o_ptr->number);
+				msg_format("You get %ldgp.", (long int)(1000000L * o_ptr->number));
 #endif
 				p_ptr->au += 1000000L * o_ptr->number;
 				p_ptr->redraw |= (PR_GOLD);
@@ -2269,9 +2276,9 @@ static bool kankin(void)
 			if (get_check(buf))
 			{
 #ifdef JP
-				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", 200000L * o_ptr->number);
+				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", (long int)(200000L * o_ptr->number));
 #else
-				msg_format("You get %ldgp.", 200000L * o_ptr->number);
+				msg_format("You get %ldgp.", (long int)(200000L * o_ptr->number));
 #endif
 				p_ptr->au += 200000L * o_ptr->number;
 				p_ptr->redraw |= (PR_GOLD);
@@ -2300,9 +2307,9 @@ static bool kankin(void)
 			if (get_check(buf))
 			{
 #ifdef JP
-				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", 100000L * o_ptr->number);
+				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", (long int)(100000L * o_ptr->number));
 #else
-				msg_format("You get %ldgp.", 100000L * o_ptr->number);
+				msg_format("You get %ldgp.", (long int)(100000L * o_ptr->number));
 #endif
 				p_ptr->au += 100000L * o_ptr->number;
 				p_ptr->redraw |= (PR_GOLD);
@@ -2329,9 +2336,9 @@ static bool kankin(void)
 			if (get_check(buf))
 			{
 #ifdef JP
-				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", (r_info[today_mon].level * 50 + 100) * o_ptr->number);
+				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", (long int)((r_info[today_mon].level * 50 + 100) * o_ptr->number));
 #else
-				msg_format("You get %ldgp.", (r_info[today_mon].level * 50 + 100) * o_ptr->number);
+				msg_format("You get %ldgp.", (long int)((r_info[today_mon].level * 50 + 100) * o_ptr->number));
 #endif
 				p_ptr->au += (r_info[today_mon].level * 50 + 100) * o_ptr->number;
 				p_ptr->redraw |= (PR_GOLD);
@@ -2359,9 +2366,9 @@ static bool kankin(void)
 			if (get_check(buf))
 			{
 #ifdef JP
-				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", (r_info[today_mon].level * 30 + 60) * o_ptr->number);
+				msg_format("¾Þ¶â %ld¡ð¤ò¼ê¤ËÆþ¤ì¤¿¡£", (long int)((r_info[today_mon].level * 30 + 60) * o_ptr->number));
 #else
-				msg_format("You get %ldgp.", (r_info[today_mon].level * 30 + 60) * o_ptr->number);
+				msg_format("You get %ldgp.", (long int)((r_info[today_mon].level * 30 + 60) * o_ptr->number));
 #endif
 				p_ptr->au += (r_info[today_mon].level * 30 + 60) * o_ptr->number;
 				p_ptr->redraw |= (PR_GOLD);
@@ -2820,7 +2827,7 @@ msg_print("
 			}
 			else
 			{
-				int oldturn = turn;
+				s32b oldturn = turn;
 				int prev_day, prev_hour, prev_min;
 
 				extract_day_hour_min(&prev_day, &prev_hour, &prev_min);
@@ -2831,11 +2838,17 @@ msg_print("
 				else do_cmd_write_nikki(NIKKI_BUNSHOU, 0, "stay over night at the inn.");
 #endif
 				turn = (turn / (TURNS_PER_TICK*TOWN_DAWN/2) + 1) * (TURNS_PER_TICK*TOWN_DAWN/2);
+				if (dungeon_turn < dungeon_turn_limit)
+				{
+					dungeon_turn += MIN(turn - oldturn, TURNS_PER_TICK * 250);
+					if (dungeon_turn > dungeon_turn_limit) dungeon_turn = dungeon_turn_limit;
+				}
+
+				prevent_turn_overflow();
+
 				if ((prev_hour >= 18) && (prev_hour <= 23)) do_cmd_write_nikki(NIKKI_HIGAWARI, 0, NULL);
 				p_ptr->chp = p_ptr->mhp;
 
-				dungeon_turn += MIN(turn - oldturn, TURNS_PER_TICK*250);
-
 				if (ironman_nightmare)
 				{
 #ifdef JP
@@ -3618,11 +3631,10 @@ static bool enchant_item(int cost, int to_hit, int to_dam, int to_ac)
 	int         maxenchant = (p_ptr->lev / 5);
 	char        tmp_str[MAX_NLEN];
 
-
 	clear_bldg(4, 18);
 #ifdef JP
-prt(format("¸½ºß¤Î¤¢¤Ê¤¿¤Îµ»Î̤À¤È¡¢+%d ¤Þ¤Ç²þÎɤǤ­¤Þ¤¹¡£", maxenchant), 5, 0);
-prt(format(" ²þÎɤÎÎÁ¶â¤Ï°ì¸Ä¤Ë¤Ä¤­¡ð%d ¤Ç¤¹¡£", cost), 7, 0);
+	prt(format("¸½ºß¤Î¤¢¤Ê¤¿¤Îµ»Î̤À¤È¡¢+%d ¤Þ¤Ç²þÎɤǤ­¤Þ¤¹¡£", maxenchant), 5, 0);
+	prt(format(" ²þÎɤÎÎÁ¶â¤Ï°ì¸Ä¤Ë¤Ä¤­¡ð%d ¤Ç¤¹¡£", cost), 7, 0);
 #else
 	prt(format("  Based on your skill, we can improve up to +%d.", maxenchant), 5, 0);
 	prt(format("  The price for the service is %d gold per item.", cost), 7, 0);
@@ -3632,8 +3644,8 @@ prt(format(" 
 
 	/* Get an item */
 #ifdef JP
-q = "¤É¤Î¥¢¥¤¥Æ¥à¤ò²þÎɤ·¤Þ¤¹¤«¡©";
-s = "²þÎɤǤ­¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó¡£";
+	q = "¤É¤Î¥¢¥¤¥Æ¥à¤ò²þÎɤ·¤Þ¤¹¤«¡©";
+	s = "²þÎɤǤ­¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó¡£";
 #else
 	q = "Improve which item? ";
 	s = "You have nothing to improve.";
@@ -3649,7 +3661,7 @@ s = "
 	{
 		object_desc(tmp_str, o_ptr, OD_NAME_ONLY);
 #ifdef JP
-msg_format("%s¤ò²þÎɤ¹¤ë¤À¤±¤Î¥´¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡ª", tmp_str);
+		msg_format("%s¤ò²þÎɤ¹¤ë¤À¤±¤Î¥´¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó¡ª", tmp_str);
 #else
 		msg_format("You do not have the gold to improve %s!", tmp_str);
 #endif
@@ -3704,21 +3716,20 @@ msg_format("%s
 
 		/* Message */
 #ifdef JP
-msg_print("²þÎɤ˼ºÇÔ¤·¤¿¡£");
+		msg_print("²þÎɤ˼ºÇÔ¤·¤¿¡£");
 #else
 		msg_print("The improvement failed.");
 #endif
 
-
 		return (FALSE);
 	}
 	else
 	{
 		object_desc(tmp_str, o_ptr, OD_NAME_AND_ENCHANT);
 #ifdef JP
-msg_format("¡ð%d ¤Ç%s¤ò²þÎɤ·¤Þ¤·¤¿¡£", cost * o_ptr->number, tmp_str );
+		msg_format("¡ð%d¤Ç%s¤Ë²þÎɤ·¤Þ¤·¤¿¡£", cost * o_ptr->number, tmp_str);
 #else
-		msg_format("Improved %s for %d gold.", tmp_str, cost * o_ptr->number);
+		msg_format("Improved into %s for %d gold.", tmp_str, cost * o_ptr->number);
 #endif
 
 		/* Charge the money */
@@ -3967,10 +3978,11 @@ if (get_check(format("
 
 		/* Get the quantity for staves and wands */
 #ifdef JP
-		charges = get_quantity(format("°ì²óʬ¡ð%d ¤Ç²¿²óʬ½¼Å¶¤·¤Þ¤¹¤«¡©",
+charges = get_quantity(format("°ì²óʬ¡ð%d ¤Ç²¿²óʬ½¼Å¶¤·¤Þ¤¹¤«¡©",
 #else
 		charges = get_quantity(format("Add how many charges for %d gold? ",
 #endif
+
 			      price), MIN(p_ptr->au / price, max_charges));
 
 		/* Do nothing */
@@ -4352,12 +4364,12 @@ if (!get_com("
 	{
 		all = TRUE;
 #ifdef JP
-		if (!get_string("̾Á°(±Ñ¸ì¤Î¾ì¹ç¾®Ê¸»ú¤Ç²Ä)", temp, 70, TRUE))
+		if (!get_string("̾Á°(±Ñ¸ì¤Î¾ì¹ç¾®Ê¸»ú¤Ç²Ä)",temp, 70))
 #else
-		if (!get_string("Enter name:",temp, 70, TRUE))
+		if (!get_string("Enter name:",temp, 70))
 #endif
 		{
-			temp[0] = 0;
+			temp[0]=0;
 
 			/* Restore */
 			screen_load();
@@ -4913,7 +4925,7 @@ void do_cmd_bldg(void)
 		return;
 	}
 
-	which = f_info[cave[py][px].feat].power;
+	which = f_info[cave[py][px].feat].subtype;
 
 	bldg = &building[which];