OSDN Git Service

[Refactor] #37353 dungeon_idx を player_type 構造体に編入。 / Enter dungeon_idx to player_typ...
[hengband/hengband.git] / src / dungeon.c
index ccf4590..eaf1c28 100644 (file)
 #include "cmd-zaprod.h"
 #include "cmd-zapwand.h"
 #include "cmd-pet.h"
+#include "floor.h"
 #include "floor-events.h"
 #include "object-curse.h"
 #include "store.h"
+#include "spells-summon.h"
+#include "spells-object.h"
+#include "spells-status.h"
 #include "monsterrace-hook.h"
 #include "world.h"
+#include "mutation.h"
+#include "quest.h"
+#include "artifact.h"
+#include "avatar.h"
+#include "player-status.h"
+#include "cmd-spell.h"
+#include "realm-hex.h"
 
 static bool load = TRUE; /*!<ロード処理中の分岐フラグ*/
 static int wild_regen = 20; /*!<広域マップ移動時の自然回復処理カウンタ(広域マップ1マス毎に20回処理を基本とする)*/
@@ -139,7 +150,6 @@ static void sense_inventory_aux(INVENTORY_IDX slot, bool heavy)
 
        }
 
-       /* We have "felt" it */
        o_ptr->ident |= (IDENT_SENSE);
 
        /* Set the "inscription" */
@@ -147,9 +157,7 @@ static void sense_inventory_aux(INVENTORY_IDX slot, bool heavy)
 
        /* Auto-inscription/destroy */
        autopick_alter_item(slot, destroy_feeling);
-
-       /* Combine / Reorder the pack (later) */
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+       p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
        p_ptr->window |= (PW_INVEN | PW_EQUIP);
 }
@@ -523,15 +531,15 @@ static void pattern_teleport(void)
        /* Ask for level */
        if (get_check(_("他の階にテレポートしますか?", "Teleport level? ")))
        {
-               char    ppp[80];
-               char    tmp_val[160];
+               char ppp[80];
+               char tmp_val[160];
 
                /* Only downward in ironman mode */
                if (ironman_downward)
                        min_level = dun_level;
 
                /* Maximum level */
-               if (dungeon_type == DUNGEON_ANGBAND)
+               if (p_ptr->dungeon_idx == DUNGEON_ANGBAND)
                {
                        if (dun_level > 100)
                                max_level = MAX_DEPTH - 1;
@@ -540,8 +548,8 @@ static void pattern_teleport(void)
                }
                else
                {
-                       max_level = d_info[dungeon_type].maxdepth;
-                       min_level = d_info[dungeon_type].mindepth;
+                       max_level = d_info[p_ptr->dungeon_idx].maxdepth;
+                       min_level = d_info[p_ptr->dungeon_idx].mindepth;
                }
 
                /* Prompt */
@@ -582,10 +590,10 @@ static void pattern_teleport(void)
 
        leave_quest_check();
 
-       if (record_stair) do_cmd_write_nikki(NIKKI_PAT_TELE,0,NULL);
+       if (record_stair) do_cmd_write_nikki(NIKKI_PAT_TELE, 0, NULL);
 
        p_ptr->inside_quest = 0;
-       p_ptr->energy_use = 0;
+       free_turn(p_ptr);
 
        /*
         * Clear all saved floors
@@ -616,9 +624,7 @@ static void wreck_the_pattern(void)
        msg_print(_("パターンを血で汚してしまった!", "You bleed on the Pattern!"));
        msg_print(_("何か恐ろしい事が起こった!", "Something terrible happens!"));
 
-       if (!IS_INVULN())
-               take_hit(DAMAGE_NOESCAPE, damroll(10, 8), _("パターン損壊", "corrupting the Pattern"), -1);
-
+       if (!IS_INVULN()) take_hit(DAMAGE_NOESCAPE, damroll(10, 8), _("パターン損壊", "corrupting the Pattern"), -1);
        to_ruin = randint1(45) + 35;
 
        while (to_ruin--)
@@ -972,7 +978,7 @@ static void regen_captured_monsters(void)
        if (heal)
        {
                /* Combine pack */
-               p_ptr->notice |= (PN_COMBINE);
+               p_ptr->update |= (PU_COMBINE);
                p_ptr->window |= (PW_INVEN);
                p_ptr->window |= (PW_EQUIP);
                wild_regen = 20;
@@ -1049,7 +1055,7 @@ void leave_quest_check(void)
               (q_ptr->status == QUEST_STATUS_TAKEN))
                {
                        q_ptr->status = QUEST_STATUS_FAILED;
-                       q_ptr->complev = (byte)p_ptr->lev;
+                       q_ptr->complev = p_ptr->lev;
                        update_playtime();
                        q_ptr->comptime = playtime;
 
@@ -1058,7 +1064,7 @@ void leave_quest_check(void)
                        {
                          case QUEST_TYPE_TOWER:
                                quest[QUEST_TOWER1].status = QUEST_STATUS_FAILED;
-                               quest[QUEST_TOWER1].complev = (byte)p_ptr->lev;
+                               quest[QUEST_TOWER1].complev = p_ptr->lev;
                                break;
                          case QUEST_TYPE_FIND_ARTIFACT:
                                a_info[q_ptr->k_idx].gen_flags &= ~(TRG_QUESTITEM);
@@ -1099,7 +1105,7 @@ void leave_tower_check(void)
                if(quest[leaving_quest].type == QUEST_TYPE_TOWER)
                {
                        quest[QUEST_TOWER1].status = QUEST_STATUS_FAILED;
-                       quest[QUEST_TOWER1].complev = (byte)p_ptr->lev;
+                       quest[QUEST_TOWER1].complev = p_ptr->lev;
                        update_playtime();
                        quest[QUEST_TOWER1].comptime = playtime;
                }
@@ -1116,7 +1122,7 @@ static void recharged_notice(object_type *o_ptr)
 {
        GAME_TEXT o_name[MAX_NLEN];
 
-       cptr s;
+       concptr s;
 
        /* No inscription */
        if (!o_ptr->inscription) return;
@@ -1200,12 +1206,8 @@ static void check_music(void)
                        INTERUPTING_SONG_EFFECT(p_ptr) = MUSIC_NONE;
                        msg_print(_("歌を再開した。", "You restart singing."));
                        p_ptr->action = ACTION_SING;
-                       p_ptr->update |= (PU_BONUS | PU_HP);
-
-                       /* Redraw map and status bar */
+                       p_ptr->update |= (PU_BONUS | PU_HP | PU_MONSTERS);
                        p_ptr->redraw |= (PR_MAP | PR_STATUS | PR_STATE);
-                       p_ptr->update |= (PU_MONSTERS);
-
                        p_ptr->window |= (PW_OVERHEAD | PW_DUNGEON);
                }
        }
@@ -1492,7 +1494,7 @@ static void process_world_aux_hp_and_sp(void)
                        }
                        else
                        {
-                               cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+                               concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
                                msg_format(_("%sで火傷した!", "The %s burns you!"), name);
                                take_hit(DAMAGE_NOESCAPE, damage, name, -1);
                        }
@@ -1530,7 +1532,7 @@ static void process_world_aux_hp_and_sp(void)
                        }
                        else
                        {
-                               cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+                               concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
                                msg_format(_("%sに凍えた!", "The %s frostbites you!"), name);
                                take_hit(DAMAGE_NOESCAPE, damage, name, -1);
                        }
@@ -1568,7 +1570,7 @@ static void process_world_aux_hp_and_sp(void)
                        }
                        else
                        {
-                               cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+                               concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
                                msg_format(_("%sに感電した!", "The %s shocks you!"), name);
                                take_hit(DAMAGE_NOESCAPE, damage, name, -1);
                        }
@@ -1606,7 +1608,7 @@ static void process_world_aux_hp_and_sp(void)
                        }
                        else
                        {
-                               cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+                               concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
                                msg_format(_("%sに溶かされた!", "The %s melts you!"), name);
                                take_hit(DAMAGE_NOESCAPE, damage, name, -1);
                        }
@@ -1645,7 +1647,7 @@ static void process_world_aux_hp_and_sp(void)
                        }
                        else
                        {
-                               cptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
+                               concptr name = f_name + f_info[get_feat_mimic(&cave[p_ptr->y][p_ptr->x])].name;
                                msg_format(_("%sに毒された!", "The %s poisons you!"), name);
                                take_hit(DAMAGE_NOESCAPE, damage, name, -1);
                                if (p_ptr->resist_pois) (void)set_poisoned(p_ptr->poisoned + 3);
@@ -1656,7 +1658,7 @@ static void process_world_aux_hp_and_sp(void)
        }
 
        if (have_flag(f_ptr->flags, FF_WATER) && have_flag(f_ptr->flags, FF_DEEP) &&
-           !p_ptr->levitation && !p_ptr->can_swim)
+           !p_ptr->levitation && !p_ptr->can_swim && !p_ptr->resist_water)
        {
                if (p_ptr->total_weight > weight_limit())
                {
@@ -1708,7 +1710,7 @@ static void process_world_aux_hp_and_sp(void)
        {
                if (!IS_INVULN() && !p_ptr->wraith_form && !p_ptr->kabenuke && ((p_ptr->chp > (p_ptr->lev / 5)) || !p_ptr->pass_wall))
                {
-                       cptr dam_desc;
+                       concptr dam_desc;
                        cave_no_regen = TRUE;
 
                        if (p_ptr->pass_wall)
@@ -2595,18 +2597,18 @@ static void process_world_aux_mutation(void)
                take_hit(DAMAGE_NOESCAPE, randint1(p_ptr->wt / 6), _("転倒", "tripping"), -1);
 
                msg_print(NULL);
-               if (buki_motteruka(INVEN_RARM))
+               if (has_melee_weapon(INVEN_RARM))
                {
                        slot = INVEN_RARM;
                        o_ptr = &inventory[INVEN_RARM];
 
-                       if (buki_motteruka(INVEN_LARM) && one_in_(2))
+                       if (has_melee_weapon(INVEN_LARM) && one_in_(2))
                        {
                                o_ptr = &inventory[INVEN_LARM];
                                slot = INVEN_LARM;
                        }
                }
-               else if (buki_motteruka(INVEN_LARM))
+               else if (has_melee_weapon(INVEN_LARM))
                {
                        o_ptr = &inventory[INVEN_LARM];
                        slot = INVEN_LARM;
@@ -2947,7 +2949,6 @@ static void process_world_aux_recharge(void)
        /* Process objects on floor */
        for (i = 1; i < o_max; i++)
        {
-               /* Access object */
                object_type *o_ptr = &o_list[i];
 
                /* Skip dead objects */
@@ -3000,12 +3001,12 @@ static void process_world_aux_movement(void)
                        {
                                msg_print(_("上に引っ張りあげられる感じがする!", "You feel yourself yanked upwards!"));
 
-                               if (dungeon_type) p_ptr->recall_dungeon = dungeon_type;
+                               if (p_ptr->dungeon_idx) p_ptr->recall_dungeon = p_ptr->dungeon_idx;
                                if (record_stair)
                                        do_cmd_write_nikki(NIKKI_RECALL, dun_level, NULL);
 
                                dun_level = 0;
-                               dungeon_type = 0;
+                               p_ptr->dungeon_idx = 0;
 
                                leave_quest_check();
                                leave_tower_check();
@@ -3018,17 +3019,17 @@ static void process_world_aux_movement(void)
                        {
                                msg_print(_("下に引きずり降ろされる感じがする!", "You feel yourself yanked downwards!"));
 
-                               dungeon_type = p_ptr->recall_dungeon;
+                               p_ptr->dungeon_idx = p_ptr->recall_dungeon;
 
                                if (record_stair)
                                        do_cmd_write_nikki(NIKKI_RECALL, dun_level, NULL);
 
                                /* New depth */
-                               dun_level = max_dlv[dungeon_type];
+                               dun_level = max_dlv[p_ptr->dungeon_idx];
                                if (dun_level < 1) dun_level = 1;
 
                                /* Nightmare mode makes recall more dangerous */
-                               if (ironman_nightmare && !randint0(666) && (dungeon_type == DUNGEON_ANGBAND))
+                               if (ironman_nightmare && !randint0(666) && (p_ptr->dungeon_idx == DUNGEON_ANGBAND))
                                {
                                        if (dun_level < 50)
                                        {
@@ -3040,7 +3041,7 @@ static void process_world_aux_movement(void)
                                        }
                                        else if (dun_level > 100)
                                        {
-                                               dun_level = d_info[dungeon_type].maxdepth - 1;
+                                               dun_level = d_info[p_ptr->dungeon_idx].maxdepth - 1;
                                        }
                                }
 
@@ -3066,7 +3067,7 @@ static void process_world_aux_movement(void)
                                /* Leaving */
                                p_ptr->leaving = TRUE;
 
-                               if (dungeon_type == DUNGEON_ANGBAND)
+                               if (p_ptr->dungeon_idx == DUNGEON_ANGBAND)
                                {
                                        int i;
 
@@ -3383,10 +3384,10 @@ static void process_world(void)
        update_dungeon_feeling();
 
        /* 帰還無しモード時のレベルテレポバグ対策 / Fix for level teleport bugs on ironman_downward.*/
-       if (ironman_downward && (dungeon_type != DUNGEON_ANGBAND && dungeon_type != 0))
+       if (ironman_downward && (p_ptr->dungeon_idx != DUNGEON_ANGBAND && p_ptr->dungeon_idx != 0))
        {
                dun_level = 0;
-               dungeon_type = 0;
+               p_ptr->dungeon_idx = 0;
                prepare_change_floor_mode(CFM_FIRST_FLOOR | CFM_RAND_PLACE);
                p_ptr->inside_arena = FALSE;
                p_ptr->wild_mode = FALSE;
@@ -3575,7 +3576,7 @@ static void process_world(void)
        /*** Process the monsters ***/
 
        /* Check for creature generation. */
-       if (one_in_(d_info[dungeon_type].max_m_alloc_chance) &&
+       if (one_in_(d_info[p_ptr->dungeon_idx].max_m_alloc_chance) &&
            !p_ptr->inside_arena && !p_ptr->inside_quest && !p_ptr->inside_battle)
        {
                /* Make a new monster */
@@ -3657,7 +3658,7 @@ static void process_world(void)
                                change_wild_mode();
 
                                /* Give first move to monsters */
-                               p_ptr->energy_use = 100;
+                               take_turn(p_ptr, 100);;
 
                                /* HACk -- set the encouter flag for the wilderness generation */
                                generate_encounter = TRUE;
@@ -4063,21 +4064,21 @@ static void process_command(void)
                /* Enter store */
                case SPECIAL_KEY_STORE:
                {
-                       if (!p_ptr->wild_mode) do_cmd_store();
+                       do_cmd_store();
                        break;
                }
 
                /* Enter building -KMW- */
                case SPECIAL_KEY_BUILDING:
                {
-                       if (!p_ptr->wild_mode) do_cmd_bldg();
+                       do_cmd_bldg();
                        break;
                }
 
                /* Enter quest level -KMW- */
                case SPECIAL_KEY_QUEST:
                {
-                       if (!p_ptr->wild_mode) do_cmd_quest();
+                       do_cmd_quest();
                        break;
                }
 
@@ -4114,42 +4115,41 @@ static void process_command(void)
                                change_wild_mode();
                        else
                                do_cmd_go_down();
-
                        break;
                }
 
                /* Open a door or chest */
                case 'o':
                {
-                       if (!p_ptr->wild_mode) do_cmd_open();
+                       do_cmd_open();
                        break;
                }
 
                /* Close a door */
                case 'c':
                {
-                       if (!p_ptr->wild_mode) do_cmd_close();
+                       do_cmd_close();
                        break;
                }
 
                /* Jam a door with spikes */
                case 'j':
                {
-                       if (!p_ptr->wild_mode) do_cmd_spike();
+                       do_cmd_spike();
                        break;
                }
 
                /* Bash a door */
                case 'B':
                {
-                       if (!p_ptr->wild_mode) do_cmd_bash();
+                       do_cmd_bash();
                        break;
                }
 
                /* Disarm a trap or chest */
                case 'D':
                {
-                       if (!p_ptr->wild_mode) do_cmd_disarm();
+                       do_cmd_disarm();
                        break;
                }
 
@@ -4164,7 +4164,7 @@ static void process_command(void)
                        else if (p_ptr->pclass == CLASS_SAMURAI)
                                do_cmd_gain_hissatsu();
                        else if (p_ptr->pclass == CLASS_MAGIC_EATER)
-                               gain_magic();
+                               import_magic_device();
                        else
                                do_cmd_study();
                        break;
@@ -4198,14 +4198,14 @@ static void process_command(void)
                                {
                                        msg_print(_("呪文を唱えられない!", "You cannot cast spells!"));
                                }
-                               else if (dun_level && (d_info[dungeon_type].flags1 & DF1_NO_MAGIC) && (p_ptr->pclass != CLASS_BERSERKER) && (p_ptr->pclass != CLASS_SMITH))
+                               else if (dun_level && (d_info[p_ptr->dungeon_idx].flags1 & DF1_NO_MAGIC) && (p_ptr->pclass != CLASS_BERSERKER) && (p_ptr->pclass != CLASS_SMITH))
                                {
                                        msg_print(_("ダンジョンが魔法を吸収した!", "The dungeon absorbs all attempted magic!"));
                                        msg_print(NULL);
                                }
                                else if (p_ptr->anti_magic && (p_ptr->pclass != CLASS_BERSERKER) && (p_ptr->pclass != CLASS_SMITH))
                                {
-                                       cptr which_power = _("魔法", "magic");
+                                       concptr which_power = _("魔法", "magic");
                                        if (p_ptr->pclass == CLASS_MINDCRAFTER)
                                                which_power = _("超能力", "psionic powers");
                                        else if (p_ptr->pclass == CLASS_IMITATOR)
@@ -4220,12 +4220,12 @@ static void process_command(void)
                                                which_power = _("祈り", "prayer");
 
                                        msg_format(_("反魔法バリアが%sを邪魔した!", "An anti-magic shell disrupts your %s!"), which_power);
-                                       p_ptr->energy_use = 0;
+                                       free_turn(p_ptr);
                                }
                                else if (p_ptr->shero && (p_ptr->pclass != CLASS_BERSERKER))
                                {
                                        msg_format(_("狂戦士化していて頭が回らない!", "You cannot think directly!"));
-                                       p_ptr->energy_use = 0;
+                                       free_turn(p_ptr);
                                }
                                else
                                {
@@ -4257,7 +4257,7 @@ static void process_command(void)
                /* Issue a pet command */
                case 'p':
                {
-                       if (!p_ptr->wild_mode) do_cmd_pet();
+                       do_cmd_pet();
                        break;
                }
 
@@ -4280,16 +4280,7 @@ static void process_command(void)
                /* Activate an artifact */
                case 'A':
                {
-                       if (!p_ptr->wild_mode)
-                       {
-                       if (!p_ptr->inside_arena)
-                               do_cmd_activate();
-                       else
-                       {
-                               msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));
-                               msg_print(NULL);
-                       }
-                       }
+                       do_cmd_activate();
                        break;
                }
 
@@ -4310,44 +4301,28 @@ static void process_command(void)
                /* Fire an item */
                case 'f':
                {
-                       if (!p_ptr->wild_mode) do_cmd_fire();
+                       do_cmd_fire();
                        break;
                }
 
                /* Throw an item */
                case 'v':
                {
-                       if (!p_ptr->wild_mode) do_cmd_throw(1, FALSE, -1);
+                       do_cmd_throw(1, FALSE, -1);
                        break;
                }
 
                /* Aim a wand */
                case 'a':
                {
-                       if (!p_ptr->wild_mode)
-                       {
-                       if (!p_ptr->inside_arena)
-                               do_cmd_aim_wand();
-                       else
-                       {
-                               msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));
-                               msg_print(NULL);
-                       }
-                       }
+                       do_cmd_aim_wand();
                        break;
                }
 
                /* Zap a rod */
                case 'z':
                {
-                       if (!p_ptr->wild_mode)
-                       {
-                       if (p_ptr->inside_arena)
-                       {
-                               msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));
-                               msg_print(NULL);
-                       }
-                       else if (use_command && rogue_like_commands)
+                       if (use_command && rogue_like_commands)
                        {
                                do_cmd_use();
                        }
@@ -4355,66 +4330,37 @@ static void process_command(void)
                        {
                                do_cmd_zap_rod();
                        }
-                       }
                        break;
                }
 
                /* Quaff a potion */
                case 'q':
                {
-                       if (!p_ptr->wild_mode)
-                       {
-                       if (!p_ptr->inside_arena)
-                               do_cmd_quaff_potion();
-                       else
-                       {
-                               msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));
-                               msg_print(NULL);
-                       }
-                       }
+                       do_cmd_quaff_potion();
                        break;
                }
 
                /* Read a scroll */
                case 'r':
                {
-                       if (!p_ptr->wild_mode)
-                       {
-                       if (!p_ptr->inside_arena)
-                               do_cmd_read_scroll();
-                       else
-                       {
-                               msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));
-                               msg_print(NULL);
-                       }
-                       }
+                       do_cmd_read_scroll();
                        break;
                }
 
                /* Use a staff */
                case 'u':
                {
-                       if (!p_ptr->wild_mode)
-                       {
-                       if (p_ptr->inside_arena)
-                       {
-                               msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));
-                               msg_print(NULL);
-                       }
-                       else if (use_command && !rogue_like_commands)
-                       {
+                       if (use_command && !rogue_like_commands)
                                do_cmd_use();
-                       }
                        else
                                do_cmd_use_staff();
-                       }
                        break;
                }
 
                /* Use racial power */
                case 'U':
                {
-                       if (!p_ptr->wild_mode) do_cmd_racial_power();
+                       do_cmd_racial_power();
                        break;
                }
 
@@ -4445,7 +4391,7 @@ static void process_command(void)
                /* Target monster or location */
                case '*':
                {
-                       if (!p_ptr->wild_mode) do_cmd_target();
+                       do_cmd_target();
                        break;
                }
 
@@ -4554,7 +4500,7 @@ static void process_command(void)
                /* Repeat level feeling */
                case KTRL('F'):
                {
-                       if (!p_ptr->wild_mode) do_cmd_feeling();
+                       do_cmd_feeling();
                        break;
                }
 
@@ -4696,22 +4642,6 @@ static void process_command(void)
 }
 
 /*!
- * @brief モンスター種族が釣れる種族かどうかを判定する。
- * @param r_idx 判定したいモンスター種族のID
- * @return 釣れる対象ならばTRUEを返す
- */
-static bool monster_tsuri(MONRACE_IDX r_idx)
-{
-       monster_race *r_ptr = &r_info[r_idx];
-
-       if ((r_ptr->flags7 & RF7_AQUATIC) && !(r_ptr->flags1 & RF1_UNIQUE) && my_strchr("Jjlw", r_ptr->d_char))
-               return TRUE;
-       else
-               return FALSE;
-}
-
-
-/*!
  * @brief アイテムの所持種類数が超えた場合にアイテムを床に落とす処理 / Hack -- Pack Overflow
  * @return なし
  */
@@ -4723,7 +4653,7 @@ static void pack_overflow(void)
                object_type *o_ptr;
 
                /* Is auto-destroy done? */
-               handle_stuff();
+               update_creature(p_ptr);
                if (!inventory[INVEN_PACK].k_idx) return;
 
                /* Access the slot to be dropped */
@@ -4873,7 +4803,7 @@ static void process_player(void)
                {
                        MONRACE_IDX r_idx;
                        bool success = FALSE;
-                       get_mon_num_prep(monster_tsuri,NULL);
+                       get_mon_num_prep(monster_is_fishing_target,NULL);
                        r_idx = get_mon_num(dun_level ? dun_level : wilderness[p_ptr->wilderness_y][p_ptr->wilderness_x].level);
                        msg_print(NULL);
                        if (r_idx && one_in_(2))
@@ -5051,7 +4981,7 @@ static void process_player(void)
                if (!command_new) command_see = FALSE;
 
                /* Assume free turn */
-               p_ptr->energy_use = 0;
+               free_turn(p_ptr);
 
                if (p_ptr->inside_battle)
                {
@@ -5067,7 +4997,7 @@ static void process_player(void)
                /* Paralyzed or Knocked Out */
                else if (p_ptr->paralyzed || (p_ptr->stun >= 100))
                {
-                       p_ptr->energy_use = 100;
+                       take_turn(p_ptr, 100);;
                }
 
                /* Resting */
@@ -5080,18 +5010,16 @@ static void process_player(void)
                                resting--;
 
                                if (!resting) set_action(ACTION_NONE);
-
-                               /* Redraw the state */
                                p_ptr->redraw |= (PR_STATE);
                        }
 
-                       p_ptr->energy_use = 100;
+                       take_turn(p_ptr, 100);;
                }
 
                /* Fishing */
                else if (p_ptr->action == ACTION_FISH)
                {
-                       p_ptr->energy_use = 100;
+                       take_turn(p_ptr, 100);;
                }
 
                /* Running */
@@ -5155,7 +5083,7 @@ static void process_player(void)
                if (p_ptr->energy_use)
                {
                        /* Use some energy */
-                       if (world_player || p_ptr->energy_use > 400)
+                       if (p_ptr->timewalk || p_ptr->energy_use > 400)
                        {
                                /* The Randomness is irrelevant */
                                p_ptr->energy_need += p_ptr->energy_use * TURNS_PER_TICK / 10;
@@ -5283,7 +5211,7 @@ static void process_player(void)
                                p_ptr->redraw |= (PR_STATE);
                        }
 
-                       if (world_player && (p_ptr->energy_need > - 1000))
+                       if (p_ptr->timewalk && (p_ptr->energy_need > - 1000))
                        {
 
                                p_ptr->redraw |= (PR_MAP);
@@ -5293,7 +5221,7 @@ static void process_player(void)
 
                                msg_print(_("「時は動きだす…」", "You feel time flowing around you once more."));
                                msg_print(NULL);
-                               world_player = FALSE;
+                               p_ptr->timewalk = FALSE;
                                p_ptr->energy_need = ENERGY_NEED();
 
                                /* Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window" */
@@ -5304,7 +5232,7 @@ static void process_player(void)
                /* Hack -- notice death */
                if (!p_ptr->playing || p_ptr->is_dead)
                {
-                       world_player = FALSE;
+                       p_ptr->timewalk = FALSE;
                        break;
                }
 
@@ -5393,9 +5321,9 @@ static void dungeon(bool load_game)
 
 
        /* Track maximum dungeon level (if not in quest -KMW-) */
-       if ((max_dlv[dungeon_type] < dun_level) && !p_ptr->inside_quest)
+       if ((max_dlv[p_ptr->dungeon_idx] < dun_level) && !p_ptr->inside_quest)
        {
-               max_dlv[dungeon_type] = dun_level;
+               max_dlv[p_ptr->dungeon_idx] = dun_level;
                if (record_maxdepth) do_cmd_write_nikki(NIKKI_MAXDEAPTH, dun_level, NULL);
        }
 
@@ -5433,7 +5361,7 @@ static void dungeon(bool load_game)
        character_xtra = FALSE;
 
        p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-       p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+       p_ptr->update |= (PU_COMBINE | PU_REORDER);
        handle_stuff();
        Term_fresh();
 
@@ -5462,22 +5390,22 @@ static void dungeon(bool load_game)
        if (!p_ptr->playing || p_ptr->is_dead) return;
 
        /* Print quest message if appropriate */
-       if (!p_ptr->inside_quest && (dungeon_type == DUNGEON_ANGBAND))
+       if (!p_ptr->inside_quest && (p_ptr->dungeon_idx == DUNGEON_ANGBAND))
        {
                quest_discovery(random_quest_number(dun_level));
                p_ptr->inside_quest = random_quest_number(dun_level);
        }
-       if ((dun_level == d_info[dungeon_type].maxdepth) && d_info[dungeon_type].final_guardian)
+       if ((dun_level == d_info[p_ptr->dungeon_idx].maxdepth) && d_info[p_ptr->dungeon_idx].final_guardian)
        {
-               if (r_info[d_info[dungeon_type].final_guardian].max_num)
+               if (r_info[d_info[p_ptr->dungeon_idx].final_guardian].max_num)
 #ifdef JP
                        msg_format("この階には%sの主である%sが棲んでいる。",
-                                  d_name+d_info[dungeon_type].name, 
-                                  r_name+r_info[d_info[dungeon_type].final_guardian].name);
+                                  d_name+d_info[p_ptr->dungeon_idx].name, 
+                                  r_name+r_info[d_info[p_ptr->dungeon_idx].final_guardian].name);
 #else
                        msg_format("%^s lives in this level as the keeper of %s.",
-                                          r_name+r_info[d_info[dungeon_type].final_guardian].name, 
-                                          d_name+d_info[dungeon_type].name);
+                                          r_name+r_info[d_info[p_ptr->dungeon_idx].final_guardian].name, 
+                                          d_name+d_info[p_ptr->dungeon_idx].name);
 #endif
        }
 
@@ -5874,8 +5802,7 @@ void play_game(bool new_game)
                        quit(0);
 
                p_ptr->update |= (PU_BONUS | PU_HP | PU_MANA | PU_SPELLS);
-
-               handle_stuff();
+               update_creature(p_ptr);
 
                p_ptr->is_dead = TRUE;
 
@@ -6039,7 +5966,7 @@ void play_game(bool new_game)
                s_info[p_ptr->pclass].w_max[TV_HAFTED-TV_WEAPON_BEGIN][SV_WHIP] = WEAPON_EXP_MASTER;
 
        /* Fill the arrays of floors and walls in the good proportions */
-       set_floor_and_wall(dungeon_type);
+       set_floor_and_wall(p_ptr->dungeon_idx);
 
        /* Flavor the objects */
        flavor_init();
@@ -6192,7 +6119,6 @@ void play_game(bool new_game)
                /* Process the level */
                dungeon(load_game);
 
-
                /* Hack -- prevent "icky" message */
                character_xtra = TRUE;
 
@@ -6249,106 +6175,7 @@ void play_game(bool new_game)
                                /* Mega-Hack -- Allow player to cheat death */
                                if ((p_ptr->wizard || cheat_live) && !get_check(_("死にますか? ", "Die? ")))
                                {
-                                       /* Mark social class, reset age, if needed */
-                                       if (p_ptr->sc) p_ptr->sc = p_ptr->age = 0;
-
-                                       /* Increase age */
-                                       p_ptr->age++;
-
-                                       /* Mark savefile */
-                                       p_ptr->noscore |= 0x0001;
-
-                                       msg_print(_("ウィザードモードに念を送り、死を欺いた。", "You invoke wizard mode and cheat death."));
-                                       msg_print(NULL);
-
-                                       (void)life_stream(FALSE, FALSE);
-
-                                       if (p_ptr->pclass == CLASS_MAGIC_EATER)
-                                       {
-                                               int magic_idx;
-                                               for (magic_idx = 0; magic_idx < EATER_EXT*2; magic_idx++)
-                                               {
-                                                       p_ptr->magic_num1[magic_idx] = p_ptr->magic_num2[magic_idx]*EATER_CHARGE;
-                                               }
-                                               for (; magic_idx < EATER_EXT*3; magic_idx++)
-                                               {
-                                                       p_ptr->magic_num1[magic_idx] = 0;
-                                               }
-                                       }
-
-                                       /* Restore spell points */
-                                       p_ptr->csp = p_ptr->msp;
-                                       p_ptr->csp_frac = 0;
-
-                                       /* Hack -- cancel recall */
-                                       if (p_ptr->word_recall)
-                                       {
-                                               msg_print(_("張りつめた大気が流れ去った...", "A tension leaves the air around you..."));
-                                               msg_print(NULL);
-
-                                               /* Hack -- Prevent recall */
-                                               p_ptr->word_recall = 0;
-                                               p_ptr->redraw |= (PR_STATUS);
-                                       }
-
-                                       /* Hack -- cancel alter */
-                                       if (p_ptr->alter_reality)
-                                       {
-                                               /* Hack -- Prevent alter */
-                                               p_ptr->alter_reality = 0;
-                                               p_ptr->redraw |= (PR_STATUS);
-                                       }
-
-                                       /* Note cause of death */
-                                       (void)strcpy(p_ptr->died_from, _("死の欺き", "Cheating death"));
-
-                                       /* Do not die */
-                                       p_ptr->is_dead = FALSE;
-
-                                       /* Hack -- Prevent starvation */
-                                       (void)set_food(PY_FOOD_MAX - 1);
-
-                                       dun_level = 0;
-                                       p_ptr->inside_arena = FALSE;
-                                       p_ptr->inside_battle = FALSE;
-                                       leaving_quest = 0;
-                                       p_ptr->inside_quest = 0;
-                                       if (dungeon_type) p_ptr->recall_dungeon = dungeon_type;
-                                       dungeon_type = 0;
-                                       if (lite_town || vanilla_town)
-                                       {
-                                               p_ptr->wilderness_y = 1;
-                                               p_ptr->wilderness_x = 1;
-                                               if (vanilla_town)
-                                               {
-                                                       p_ptr->oldpy = 10;
-                                                       p_ptr->oldpx = 34;
-                                               }
-                                               else
-                                               {
-                                                       p_ptr->oldpy = 33;
-                                                       p_ptr->oldpx = 131;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               p_ptr->wilderness_y = 48;
-                                               p_ptr->wilderness_x = 5;
-                                               p_ptr->oldpy = 33;
-                                               p_ptr->oldpx = 131;
-                                       }
-
-                                       /* Leaving */
-                                       p_ptr->wild_mode = FALSE;
-                                       p_ptr->leaving = TRUE;
-
-                                       do_cmd_write_nikki(NIKKI_BUNSHOU, 1, 
-                                                               _("                            しかし、生き返った。", 
-                                                                 "                            but revived."));
-
-                                       /* Prepare next floor */
-                                       leave_floor();
-                                       wipe_m_list();
+                                       cheat_death(p_ptr);
                                }
                        }
                }