OSDN Git Service

(root) / hengband / hengband.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add new option -- show_ammo_detail / show_ammo_no_crit
[hengband/hengband.git] / src / dungeon.c
diff --git a/src/dungeon.c b/src/dungeon.c
index 9485be2..d984c7d 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1129,7 +1129,7 @@ static void notice_lite_change(object_type *o_ptr)
        /* The light is now out */
        else if (o_ptr->xtra4 == 0)
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
 msg_print("ÌÀ¤«¤ê¤¬¾Ã¤¨¤Æ¤·¤Þ¤Ã¤¿¡ª");
 #else
@@ -1149,7 +1149,7 @@ msg_print("
                if ((o_ptr->xtra4 < 50) && (!(o_ptr->xtra4 % 5))
                    && (turn % (TURNS_PER_TICK*2)))
                {
-                       if (disturb_minor) disturb(0, 0);
+                       if (disturb_minor) disturb(0, 1);
 #ifdef JP
 msg_print("ÌÀ¤«¤ê¤¬Èù¤«¤Ë¤Ê¤Ã¤Æ¤­¤Æ¤¤¤ë¡£");
 #else
@@ -1162,7 +1162,7 @@ msg_print("
        /* The light is getting dim */
        else if ((o_ptr->xtra4 < 100) && (!(o_ptr->xtra4 % 10)))
        {
-               if (disturb_minor) disturb(0, 0);
+               if (disturb_minor) disturb(0, 1);
 #ifdef JP
 msg_print("ÌÀ¤«¤ê¤¬Èù¤«¤Ë¤Ê¤Ã¤Æ¤­¤Æ¤¤¤ë¡£");
 #else
@@ -2280,7 +2280,7 @@ static void process_world_aux_mutation(void)
 
        if ((p_ptr->muta2 & MUT2_BERS_RAGE) && one_in_(3000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("¥¦¥¬¥¡¥¡¥¢¡ª");
                msg_print("·ãÅܤÎȯºî¤Ë½±¤ï¤ì¤¿¡ª");
@@ -2297,7 +2297,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_fear)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
 #ifdef JP
                        msg_print("¤È¤Æ¤â°Å¤¤... ¤È¤Æ¤â¶²¤¤¡ª");
 #else
@@ -2313,7 +2313,7 @@ static void process_world_aux_mutation(void)
                if (!p_ptr->resist_nexus && !(p_ptr->muta1 & MUT1_VTELEPORT) &&
                    !p_ptr->anti_tele)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        /* Teleport player */
 #ifdef JP
@@ -2331,7 +2331,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_conf && !p_ptr->resist_chaos)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
                        p_ptr->redraw |= PR_EXTRA;
 #ifdef JP
                        msg_print("¤¤¤Ò¤­¤¬¤â¡¼¤í¡¼¤È¤Ò¤Æ¤­¤¿¤­¤¬¤Õ¤ë...¥Ò¥Ã¥¯¡ª");
@@ -2384,7 +2384,7 @@ static void process_world_aux_mutation(void)
        {
                if (!p_ptr->resist_chaos)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
                        p_ptr->redraw |= PR_EXTRA;
                        (void)set_image(p_ptr->image + randint0(50) + 20);
                }
@@ -2392,7 +2392,7 @@ static void process_world_aux_mutation(void)
 
        if ((p_ptr->muta2 & MUT2_FLATULENT) && (randint1(3000) == 13))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 
 #ifdef JP
                msg_print("¥Ö¥¥¡¼¡¼¥Ã¡ª¤ª¤Ã¤È¡£");
@@ -2408,7 +2408,7 @@ static void process_world_aux_mutation(void)
            !p_ptr->anti_magic && one_in_(9000))
        {
                int dire = 0;
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("ËâË¡¤Î¥¨¥Í¥ë¥®¡¼¤¬ÆÍÁ³¤¢¤Ê¤¿¤ÎÃæ¤Ëή¤ì¹þ¤ó¤Ç¤­¤¿¡ª¥¨¥Í¥ë¥®¡¼¤ò²òÊü¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡ª");
 #else
@@ -2439,13 +2439,13 @@ static void process_world_aux_mutation(void)
                        msg_print("You have attracted a demon!");
 #endif
 
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
 
        if ((p_ptr->muta2 & MUT2_SPEED_FLUX) && one_in_(6000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
                if (one_in_(2))
                {
 #ifdef JP
@@ -2484,7 +2484,7 @@ static void process_world_aux_mutation(void)
        }
        if ((p_ptr->muta2 & MUT2_BANISH_ALL) && one_in_(9000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("ÆÍÁ³¤Û¤È¤ó¤É¸ÉÆȤˤʤ俵¤¤¬¤¹¤ë¡£");
 #else
@@ -2582,14 +2582,14 @@ static void process_world_aux_mutation(void)
                        msg_print("You have attracted an animal!");
 #endif
 
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
 
        if ((p_ptr->muta2 & MUT2_RAW_CHAOS) &&
            !p_ptr->anti_magic && one_in_(8000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("¼þ¤ê¤Î¶õ´Ö¤¬ÏĤó¤Ç¤¤¤ëµ¤¤¬¤¹¤ë¡ª");
 #else
@@ -2611,7 +2611,7 @@ static void process_world_aux_mutation(void)
        }
        if ((p_ptr->muta2 & MUT2_WRAITH) && !p_ptr->anti_magic && one_in_(3000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("Èóʪ¼Á²½¤·¤¿¡ª");
 #else
@@ -2662,7 +2662,7 @@ static void process_world_aux_mutation(void)
 
                if (!sustained)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
 #ifdef JP
                        msg_print("¼«Ê¬¤¬¿ê¼å¤·¤Æ¤¤¤¯¤Î¤¬Ê¬¤«¤ë¡ª");
 #else
@@ -2690,7 +2690,7 @@ static void process_world_aux_mutation(void)
                        msg_print("You have attracted a dragon!");
 #endif
 
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
        if ((p_ptr->muta2 & MUT2_WEIRD_MIND) && !p_ptr->anti_magic &&
@@ -2720,7 +2720,7 @@ static void process_world_aux_mutation(void)
        if ((p_ptr->muta2 & MUT2_NAUSEA) && !p_ptr->slow_digest &&
            one_in_(9000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("°ß¤¬áÛÚ»¤·¡¢¿©»ö¤ò¼º¤Ã¤¿¡ª");
 #else
@@ -2804,7 +2804,7 @@ static void process_world_aux_mutation(void)
        if ((p_ptr->muta2 & MUT2_INVULN) && !p_ptr->anti_magic &&
            one_in_(5000))
        {
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("̵Ũ¤Êµ¤¤¬¤¹¤ë¡ª");
 #else
@@ -2865,7 +2865,7 @@ static void process_world_aux_mutation(void)
                int slot = 0;
                object_type *o_ptr = NULL;
 
-               disturb(0, 0);
+               disturb(0, 1);
 #ifdef JP
                msg_print("­¤¬¤â¤Ä¤ì¤Æž¤ó¤À¡ª");
                take_hit(DAMAGE_NOESCAPE, randint1(p_ptr->wt / 6), "žÅÝ", -1);
@@ -2959,7 +2959,7 @@ static void process_world_aux_curse(void)
                        if (get_check_strict("Teleport? ", CHECK_OKAY_CANCEL))
 #endif
                        {
-                               disturb(0, 0);
+                               disturb(0, 1);
                                teleport_player(50, 0L);
                        }
                        else
@@ -2969,7 +2969,7 @@ static void process_world_aux_curse(void)
 #else
                                msg_format("You can inscribe {.} on your %s to disable random teleportation. ", o_name);
 #endif
-                               disturb(1, 0);
+                               disturb(1, 1);
                        }
                }
                /* Make a chainsword noise */
@@ -3069,7 +3069,7 @@ static void process_world_aux_curse(void)
                                msg_format("Your %s have attracted an animal!", o_name);
 #endif
 
-                               disturb(0, 0);
+                               disturb(0, 1);
                        }
                }
                /* Call demon */
@@ -3086,7 +3086,7 @@ static void process_world_aux_curse(void)
                                msg_format("Your %s have attracted a demon!", o_name);
 #endif
 
-                               disturb(0, 0);
+                               disturb(0, 1);
                        }
                }
                /* Call dragon */
@@ -3104,14 +3104,14 @@ static void process_world_aux_curse(void)
                                msg_format("Your %s have attracted an animal!", o_name);
 #endif
 
-                               disturb(0, 0);
+                               disturb(0, 1);
                        }
                }
                if ((p_ptr->cursed & TRC_COWARDICE) && one_in_(1500))
                {
                        if (!p_ptr->resist_fear)
                        {
-                               disturb(0, 0);
+                               disturb(0, 1);
 #ifdef JP
                                msg_print("¤È¤Æ¤â°Å¤¤... ¤È¤Æ¤â¶²¤¤¡ª");
 #else
@@ -3124,7 +3124,7 @@ static void process_world_aux_curse(void)
                /* Teleport player */
                if ((p_ptr->cursed & TRC_TELEPORT) && one_in_(200) && !p_ptr->anti_tele)
                {
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        /* Teleport player */
                        teleport_player(40, TELEPORT_PASSIVE);
@@ -3324,7 +3324,7 @@ static void process_world_aux_movement(void)
                if (!p_ptr->word_recall)
                {
                        /* Disturbing! */
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        /* Determine the level */
                        if (dun_level || p_ptr->inside_quest || p_ptr->enter_dungeon)
@@ -3438,7 +3438,7 @@ static void process_world_aux_movement(void)
                if (!p_ptr->alter_reality)
                {
                        /* Disturbing! */
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        /* Determine the level */
                        if (!quest_number(dun_level) && dun_level)
@@ -3824,7 +3824,7 @@ static void process_world(void)
                        if (closing_flag <= 2)
                        {
                                /* Disturb */
-                               disturb(0, 0);
+                               disturb(0, 1);
 
                                /* Count warnings */
                                closing_flag++;
@@ -4088,7 +4088,7 @@ msg_print("
                if ((hour == 23) && !(min % 15))
                {
                        /* Disturbing */
-                       disturb(0, 0);
+                       disturb(0, 1);
 
                        switch (min / 15)
                        {
@@ -4131,7 +4131,7 @@ msg_print("
                {
                        int count = 0;
 
-                       disturb(1, 0);
+                       disturb(1, 1);
 #ifdef JP
                        msg_print("±ó¤¯¤Ç¾â¤¬²¿²ó¤âÌĤꡢ»à¤ó¤À¤è¤¦¤ÊÀŤ±¤µ¤ÎÃæ¤Ø¾Ã¤¨¤Æ¤¤¤Ã¤¿¡£");
 #else
@@ -4195,7 +4195,7 @@ msg_print("
                                msg_print("You faint from the lack of food.");
 #endif
 
-                               disturb(1, 0);
+                               disturb(1, 1);
 
                                /* Hack -- faint (bypass free action) */
                                (void)set_paralyzed(p_ptr->paralyzed + 1 + randint0(5));
@@ -5448,7 +5448,7 @@ static void pack_overflow(void)
                o_ptr = &inventory[INVEN_PACK];
 
                /* Disturbing */
-               disturb(0, 0);
+               disturb(0, 1);
 
                /* Warning */
 #ifdef JP
@@ -5634,7 +5634,7 @@ msg_print("
                                msg_print("Damn!  The fish stole your bait!");
 #endif
                        }
-                       disturb(0, 0);
+                       disturb(0, 1);
                }
        }
 
@@ -5642,7 +5642,7 @@ msg_print("
        if (check_abort)
        {
                /* Check for "player abort" (semi-efficiently for resting) */
-               if (running || command_rep || (p_ptr->action == ACTION_REST) || (p_ptr->action == ACTION_FISH))
+               if (running || travel.run || command_rep || (p_ptr->action == ACTION_REST) || (p_ptr->action == ACTION_FISH))
                {
                        /* Do not wait */
                        inkey_scan = TRUE;
@@ -5654,7 +5654,7 @@ msg_print("
                                flush();
 
                                /* Disturb */
-                               disturb(0, 0);
+                               disturb(0, 1);
 
                                /* Hack -- Show a Message */
 #ifdef JP
@@ -6173,7 +6173,7 @@ static void dungeon(bool load_game)
 
 
        /* Disturb */
-       disturb(1, 0);
+       disturb(1, 1);
 
        /* Get index of current quest (if any) */
        quest_num = quest_number(dun_level);
@@ -6636,6 +6636,7 @@ void play_game(bool new_game)
 {
        int i;
        bool load_game = TRUE;
+       bool init_random_seed = FALSE;
 
 #ifdef CHUUKEI
        if (chuukei_client)
@@ -6783,7 +6784,7 @@ quit("
                character_dungeon = FALSE;
 
                /* Prepare to init the RNG */
-               Rand_quick = TRUE;
+               init_random_seed = TRUE;
 
                /* Initialize the saved floors data */
                init_saved_floors(FALSE);
@@ -6804,7 +6805,7 @@ quit("
        }
 
        /* Init the RNG */
-       if (Rand_quick)
+       if (init_random_seed)
        {
                u32b seed;
 
@@ -6818,10 +6819,7 @@ quit("
 
 #endif
 
-               /* Use the complex RNG */
-               Rand_quick = FALSE;
-
-               /* Seed the "complex" RNG */
+               /* Seed the RNG */
                Rand_state_init(seed);
        }
 
@@ -7063,6 +7061,7 @@ prt("
                m_ptr->maxhp = r_ptr->hdice*(r_ptr->hside+1)/2;
                m_ptr->max_maxhp = m_ptr->maxhp;
                m_ptr->hp = r_ptr->hdice*(r_ptr->hside+1)/2;
+               m_ptr->dealt_damage = 0;
                m_ptr->energy_need = ENERGY_NEED() + ENERGY_NEED();
        }
 
変愚蛮怒のメインリポジトリです
About OSDN
Find Software
Develop Software
Help