| Revision | a48f5e3ddf4dbff40844e78101081b44a86d15bb (tree) |
|---|---|
| Time | 2019-06-20 21:32:44 |
| Author | deskull <deskull@user...> |
| Commiter | deskull |
[Refactor] #38997 do_cmd_open_chest() に player_type * 引数を追加．
src/cmd-basic.c (diff)| @@ -552,14 +552,14 @@ static OBJECT_IDX chest_check(POSITION y, POSITION x, bool trapped) | ||
| 552 | 552 | * @details |
| 553 | 553 | * Assume there is no monster blocking the destination |
| 554 | 554 | */ |
| 555 | -static bool do_cmd_open_chest(POSITION y, POSITION x, OBJECT_IDX o_idx) | |
| 555 | +static bool do_cmd_open_chest(player_type *creature_ptr, POSITION y, POSITION x, OBJECT_IDX o_idx) | |
| 556 | 556 | { |
| 557 | 557 | int i, j; |
| 558 | 558 | bool flag = TRUE; |
| 559 | 559 | bool more = FALSE; |
| 560 | 560 | object_type *o_ptr = ¤t_floor_ptr->o_list[o_idx]; |
| 561 | 561 | |
| 562 | - take_turn(p_ptr, 100); | |
| 562 | + take_turn(creature_ptr, 100); | |
| 563 | 563 | |
| 564 | 564 | /* Attempt to unlock it */ |
| 565 | 565 | if (o_ptr->pval > 0) |
| @@ -568,11 +568,11 @@ static bool do_cmd_open_chest(POSITION y, POSITION x, OBJECT_IDX o_idx) | ||
| 568 | 568 | flag = FALSE; |
| 569 | 569 | |
| 570 | 570 | /* Get the "disarm" factor */ |
| 571 | - i = p_ptr->skill_dis; | |
| 571 | + i = creature_ptr->skill_dis; | |
| 572 | 572 | |
| 573 | 573 | /* Penalize some conditions */ |
| 574 | - if (p_ptr->blind || no_lite()) i = i / 10; | |
| 575 | - if (p_ptr->confused || p_ptr->image) i = i / 10; | |
| 574 | + if (creature_ptr->blind || no_lite()) i = i / 10; | |
| 575 | + if (creature_ptr->confused || creature_ptr->image) i = i / 10; | |
| 576 | 576 | |
| 577 | 577 | /* Extract the difficulty */ |
| 578 | 578 | j = i - o_ptr->pval; |
| @@ -890,7 +890,7 @@ void do_cmd_open(player_type *creature_ptr) | ||
| 890 | 890 | } |
| 891 | 891 | else if (o_idx) |
| 892 | 892 | { |
| 893 | - more = do_cmd_open_chest(y, x, o_idx); | |
| 893 | + more = do_cmd_open_chest(creature_ptr, y, x, o_idx); | |
| 894 | 894 | } |
| 895 | 895 | else |
| 896 | 896 | { |
Fork