From: deskull <deskull@users.sourceforge.jp>
Date: Wed, 7 Aug 2019 14:17:50 +0000 (+0900)
Subject: [Refactor] #38997 do_cmd_feeling() に player_type * 引数を追加．
X-Git-Tag: vmacos3.0.0-alpha52~2848
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=19593c4e8e628ed31eca142897ff4d461a780a38;p=hengbandforosx%2Fhengbandosx.git

[Refactor] #38997 do_cmd_feeling() に player_type * 引数を追加．
---

diff --git a/src/cmd-dump.c b/src/cmd-dump.c
index caa488b05..824b01876 100644
--- a/src/cmd-dump.c
+++ b/src/cmd-dump.c
@@ -2908,21 +2908,21 @@ static concptr do_cmd_feeling_text_lucky[11] =
  * Note that "feeling" is set to zero unless some time has passed.
  * Note that this is done when the level is GENERATED, not entered.
  */
-void do_cmd_feeling(void)
+void do_cmd_feeling(player_type *creature_ptr)
 {
-	if (p_ptr->wild_mode) return;
+	if (creature_ptr->wild_mode) return;
 
 	/* No useful feeling in quests */
-	if (p_ptr->inside_quest && !random_quest_number(current_floor_ptr->dun_level))
+	if (creature_ptr->inside_quest && !random_quest_number(current_floor_ptr->dun_level))
 	{
 		msg_print(_("典型的なクエストのダンジョンのようだ。", "Looks like a typical quest level."));
 		return;
 	}
 
 	/* No useful feeling in town */
-	else if (p_ptr->town_num && !current_floor_ptr->dun_level)
+	else if (creature_ptr->town_num && !current_floor_ptr->dun_level)
 	{
-		if (!strcmp(town_info[p_ptr->town_num].name, _("荒野", "wilderness")))
+		if (!strcmp(town_info[creature_ptr->town_num].name, _("荒野", "wilderness")))
 		{
 			msg_print(_("何かありそうな荒野のようだ。", "Looks like a strange wilderness."));
 			return;
@@ -2942,13 +2942,13 @@ void do_cmd_feeling(void)
 	}
 
 	/* Display the feeling */
-	if (p_ptr->muta3 & MUT3_GOOD_LUCK)
-		msg_print(do_cmd_feeling_text_lucky[p_ptr->feeling]);
-	else if (p_ptr->pseikaku == SEIKAKU_COMBAT ||
-		 p_ptr->inventory_list[INVEN_BOW].name1 == ART_CRIMSON)
-		msg_print(do_cmd_feeling_text_combat[p_ptr->feeling]);
+	if (creature_ptr->muta3 & MUT3_GOOD_LUCK)
+		msg_print(do_cmd_feeling_text_lucky[creature_ptr->feeling]);
+	else if (creature_ptr->pseikaku == SEIKAKU_COMBAT ||
+		 creature_ptr->inventory_list[INVEN_BOW].name1 == ART_CRIMSON)
+		msg_print(do_cmd_feeling_text_combat[creature_ptr->feeling]);
 	else
-		msg_print(do_cmd_feeling_text[p_ptr->feeling]);
+		msg_print(do_cmd_feeling_text[creature_ptr->feeling]);
 }
 
 
diff --git a/src/cmd-dump.h b/src/cmd-dump.h
index bd16b8fcb..7df94fd5c 100644
--- a/src/cmd-dump.h
+++ b/src/cmd-dump.h
@@ -61,7 +61,7 @@ extern void do_cmd_visuals(player_type *creature_ptr);
 extern void do_cmd_colors(player_type *creature_ptr);
 extern void do_cmd_note(void);
 extern void do_cmd_version(void);
-extern void do_cmd_feeling(void);
+extern void do_cmd_feeling(player_type *creature_ptr);
 extern void do_cmd_load_screen(void);
 extern void do_cmd_save_screen_html_aux(char *filename, int message);
 extern void do_cmd_save_screen(void);
diff --git a/src/core.c b/src/core.c
index c254bd544..084b3c633 100644
--- a/src/core.c
+++ b/src/core.c
@@ -4158,7 +4158,7 @@ static void process_command(void)
 		/* Repeat level feeling */
 		case KTRL('F'):
 		{
-			do_cmd_feeling();
+			do_cmd_feeling(p_ptr);
 			break;
 		}
 
@@ -4992,7 +4992,7 @@ static void dungeon(bool load_game)
 
 	if (quest_num && (is_fixed_quest_idx(quest_num) &&
 	    !((quest_num == QUEST_OBERON) || (quest_num == QUEST_SERPENT) ||
-	    !(quest[quest_num].flags & QUEST_FLAG_PRESET)))) do_cmd_feeling();
+	    !(quest[quest_num].flags & QUEST_FLAG_PRESET)))) do_cmd_feeling(p_ptr);
 
 	if (p_ptr->phase_out)
 	{
diff --git a/src/floor-events.c b/src/floor-events.c
index 0c5a63aab..cf9f525df 100644
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -314,7 +314,7 @@ void update_dungeon_feeling(void)
 	p_ptr->feeling = new_feeling;
 
 	/* Announce feeling */
-	do_cmd_feeling();
+	do_cmd_feeling(p_ptr);
 
 	select_floor_music();
 
diff --git a/src/store.c b/src/store.c
index 439da856a..4f60c413a 100644
--- a/src/store.c
+++ b/src/store.c
@@ -5626,7 +5626,7 @@ static void store_process_command(void)
 		/* Repeat level feeling */
 		case KTRL('F'):
 		{
-			do_cmd_feeling();
+			do_cmd_feeling(p_ptr);
 			break;
 		}