OSDN > Find Software > Games/Entertainment > Role-Playing > 変愚蛮怒 > SCM > git > hengband > Commit

変愚蛮怒
Fork
hengband
web

hengband: Commit

変愚蛮怒のメインリポジトリです

[Refactor] #38997 status_shuffle() に player_type * 引数を追加． / Add player_type * argument to status_shuffle().

--- a/src/player-effects.c

+++ b/src/player-effects.c

		@@ -3810,7 +3810,7 @@ void do_poly_self(player_type *creature_ptr)
3810	3810	/* Note: earlier deductions may have left power < 0 already. */
3811	3811	while (power > 0)
3812	3812	{
3813		- status_shuffle();
	3813	+ status_shuffle(creature_ptr);
3814	3814	power--;
3815	3815	}
3816	3816	}

--- a/src/spells-status.c

+++ b/src/spells-status.c

		@@ -518,7 +518,7 @@ void apply_nexus(monster_type *m_ptr)
518	518	}
519	519
520	520	msg_print(_("体がねじれ始めた...", "Your body starts to scramble..."));
521		- status_shuffle();
	521	+ status_shuffle(p_ptr);
522	522	break;
523	523	}
524	524	}

		@@ -528,7 +528,7 @@ void apply_nexus(monster_type *m_ptr)
528	528	* @brief プレイヤーのステータスシャッフル処理
529	529	* @return なし
530	530	*/
531		-void status_shuffle(void)
	531	+void status_shuffle(player_type *creature_ptr)
532	532	{
533	533	BASE_STATUS max1, cur1, max2, cur2;
534	534	int ii, jj, i;

		@@ -537,21 +537,21 @@ void status_shuffle(void)
537	537	ii = randint0(A_MAX);
538	538	for (jj = ii; jj == ii; jj = randint0(A_MAX)) /* loop */;
539	539
540		- max1 = p_ptr->stat_max[ii];
541		- cur1 = p_ptr->stat_cur[ii];
542		- max2 = p_ptr->stat_max[jj];
543		- cur2 = p_ptr->stat_cur[jj];
	540	+ max1 = creature_ptr->stat_max[ii];
	541	+ cur1 = creature_ptr->stat_cur[ii];
	542	+ max2 = creature_ptr->stat_max[jj];
	543	+ cur2 = creature_ptr->stat_cur[jj];
544	544
545		- p_ptr->stat_max[ii] = max2;
546		- p_ptr->stat_cur[ii] = cur2;
547		- p_ptr->stat_max[jj] = max1;
548		- p_ptr->stat_cur[jj] = cur1;
	545	+ creature_ptr->stat_max[ii] = max2;
	546	+ creature_ptr->stat_cur[ii] = cur2;
	547	+ creature_ptr->stat_max[jj] = max1;
	548	+ creature_ptr->stat_cur[jj] = cur1;
549	549
550	550	for (i = 0; i < A_MAX; i++)
551	551	{
552		- if (p_ptr->stat_max[i] > p_ptr->stat_max_max[i]) p_ptr->stat_max[i] = p_ptr->stat_max_max[i];
553		- if (p_ptr->stat_cur[i] > p_ptr->stat_max_max[i]) p_ptr->stat_cur[i] = p_ptr->stat_max_max[i];
	552	+ if (creature_ptr->stat_max[i] > creature_ptr->stat_max_max[i]) creature_ptr->stat_max[i] = creature_ptr->stat_max_max[i];
	553	+ if (creature_ptr->stat_cur[i] > creature_ptr->stat_max_max[i]) creature_ptr->stat_cur[i] = creature_ptr->stat_max_max[i];
554	554	}
555	555
556		- p_ptr->update \|= (PU_BONUS);
	556	+ creature_ptr->update \|= (PU_BONUS);
557	557	}

--- a/src/spells-status.h

+++ b/src/spells-status.h

		@@ -26,4 +26,4 @@ extern bool restore_all_status(void);
26	26	extern bool fishing(player_type *creature_ptr);
27	27	extern bool cosmic_cast_off(player_type creature_ptr, object_type o_ptr);
28	28	extern void apply_nexus(monster_type *m_ptr);
29		-extern void status_shuffle(void);
	29	+extern void status_shuffle(player_type *creature_ptr);

--- a/src/spells1.c

+++ b/src/spells1.c

		@@ -4191,7 +4191,7 @@ static bool project_p(MONSTER_IDX who, concptr who_name, int r, POSITION y, POSI
4191	4191	if (one_in_(4)) /* 4 */
4192	4192	do_poly_self(p_ptr);
4193	4193	else
4194		- status_shuffle();
	4194	+ status_shuffle(p_ptr);
4195	4195	}
4196	4196
4197	4197	if (one_in_(6))