リビジョン | 8eac788d2306b8093d7404bf729f17acec1d741a (tree) |
---|---|
日時 | 2019-12-06 19:58:22 |
作者 | deskull <deskull@user...> |
コミッター | deskull |
[Refactor] #38997 revenge_spell() に player_type * 引数を追加. / Add player_type * argument to revenge_spell().
@@ -4360,7 +4360,7 @@ static void process_upkeep_with_speed(void) | ||
4360 | 4360 | |
4361 | 4361 | /* Hex - Handle the hex spells */ |
4362 | 4362 | if (!load) check_hex(p_ptr); |
4363 | - if (!load) revenge_spell(); | |
4363 | + if (!load) revenge_spell(p_ptr); | |
4364 | 4364 | |
4365 | 4365 | /* There is some randomness of needed energy */ |
4366 | 4366 | p_ptr->enchant_energy_need += ENERGY_NEED(); |
@@ -260,15 +260,15 @@ bool hex_spell_fully(void) | ||
260 | 260 | * @brief 一定ゲームターン毎に復讐処理の残り期間の判定を行う |
261 | 261 | * @return なし |
262 | 262 | */ |
263 | -void revenge_spell(void) | |
263 | +void revenge_spell(player_type *caster_ptr) | |
264 | 264 | { |
265 | - if (p_ptr->realm1 != REALM_HEX) return; | |
266 | - if (HEX_REVENGE_TURN(p_ptr) <= 0) return; | |
265 | + if (caster_ptr->realm1 != REALM_HEX) return; | |
266 | + if (HEX_REVENGE_TURN(caster_ptr) <= 0) return; | |
267 | 267 | |
268 | - switch(HEX_REVENGE_TYPE(p_ptr)) | |
268 | + switch(HEX_REVENGE_TYPE(caster_ptr)) | |
269 | 269 | { |
270 | - case 1: exe_spell(p_ptr, REALM_HEX, HEX_PATIENCE, SPELL_CONT); break; | |
271 | - case 2: exe_spell(p_ptr, REALM_HEX, HEX_REVENGE, SPELL_CONT); break; | |
270 | + case 1: exe_spell(caster_ptr, REALM_HEX, HEX_PATIENCE, SPELL_CONT); break; | |
271 | + case 2: exe_spell(caster_ptr, REALM_HEX, HEX_REVENGE, SPELL_CONT); break; | |
272 | 272 | } |
273 | 273 | } |
274 | 274 |
@@ -53,7 +53,7 @@ extern bool stop_hex_spell_all(void); | ||
53 | 53 | extern bool stop_hex_spell(void); |
54 | 54 | extern void check_hex(player_type *caster_ptr); |
55 | 55 | extern bool hex_spell_fully(void); |
56 | -extern void revenge_spell(void); | |
56 | +extern void revenge_spell(player_type *caster_ptr); | |
57 | 57 | extern void revenge_store(HIT_POINT dam); |
58 | 58 | extern bool teleport_barrier(MONSTER_IDX m_idx); |
59 | 59 | extern bool magic_barrier(MONSTER_IDX m_idx); |