• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision02620d2859225de3b03397f7964cf1a8c37c0000 (tree)
Time2019-05-16 00:07:01
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #38995 multi_rew を player_type の suppress_multi_reward へ改名して移動.

Change Summary

Incremental Difference

--- a/src/core.c
+++ b/src/core.c
@@ -1818,9 +1818,9 @@ static void process_world_aux_timeout(void)
18181818 (void)set_tim_invis(p_ptr->tim_invis - 1, TRUE);
18191819 }
18201820
1821- if (multi_rew)
1821+ if (p_ptr->suppress_multi_reward)
18221822 {
1823- multi_rew = FALSE;
1823+ p_ptr->suppress_multi_reward = FALSE;
18241824 }
18251825
18261826 /* Timed esp */
--- a/src/externs.h
+++ b/src/externs.h
@@ -65,7 +65,7 @@ extern MONSTER_IDX hack_m_idx;
6565 extern MONSTER_IDX hack_m_idx_ii;
6666 extern int total_friends;
6767 extern bool reinit_wilderness;
68-extern bool multi_rew;
68+
6969 extern bool reset_concent;
7070
7171
--- a/src/patron.c
+++ b/src/patron.c
@@ -247,8 +247,8 @@ void gain_level_reward(int chosen_reward)
247247
248248 if (!chosen_reward)
249249 {
250- if (multi_rew) return;
251- else multi_rew = TRUE;
250+ if (p_ptr->suppress_multi_reward) return;
251+ else p_ptr->suppress_multi_reward = TRUE;
252252 }
253253
254254
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -463,6 +463,7 @@ struct player_type
463463 /*** Extracted fields ***/
464464
465465 s16b running; /* Current counter for running, if any */
466+ bool suppress_multi_reward; /*!< 複数レベルアップ時のパトロンからの報酬多重受け取りを防止 */
466467
467468 WEIGHT total_weight; /*!< 所持品と装備品の計算総重量 / Total weight being carried */
468469
--- a/src/variable.c
+++ b/src/variable.c
@@ -38,8 +38,6 @@ bool repair_objects; /* Hack -- optimize detect objects */
3838 MONSTER_IDX hack_m_idx = 0; /* Hack -- see "process_monsters()" */
3939 MONSTER_IDX hack_m_idx_ii = 0;
4040
41-bool multi_rew = FALSE;
42-
4341 int total_friends = 0;
4442
4543 bool reinit_wilderness = FALSE;
Show on old repository browser