Changeset 483

Timestamp:

08/10/07 08:29:13 (1 year ago)

Author:

ajps

Message:

Put hallucination support back in - the actual choice of which object or monster should be hallucinated is still down to the display, but map_info decides whether a given grid should contain a 'monster' or 'object'.

Files:

• trunk/src/cave.c (modified) (11 diffs)

trunk/src/cave.c

@@ -333 +333 @@
- * Hack -- Hallucinatory monster
- */
-image
+hallucinatory
-{
-        monster_race *r_ptr;
-
+
-        byte a;
-        char c;
-
+
-        while (1)
-        {
-                /* Select a random monster */
-                r_ptr = &r_info[rand_int(z_info->r_max)];
-
+
-                /* Skip non-entries */
-                if (!r_ptr->name) continue;
-
+
-                /* Retrieve attr/char */
-                a = r_ptr->x_attr;
-                c = r_ptr->x_char;
-
+
-                /* Encode */
-                return (PICT(a,c));
@@ -361 +361 @@
- * Hack -- Hallucinatory object
- */
-image
+hallucinatory
-{
-        object_kind *k_ptr;
-
+
-        byte a;
-        char c;
-
+
-        while (1)
-        {
-                /* Select a random object */
-                k_ptr = &k_info[rand_int(z_info->k_max - 1) + 1];
-
+
-                /* Skip non-entries */
-                if (!k_ptr->name) continue;
-
+
-                /* Retrieve attr/char (HACK - without flavors) */
-                a = k_ptr->x_attr;
-                c = k_ptr->x_char;
-
+
-                /* HACK - Skip empty entries */
-                if ((a == 0) || (c == 0)) continue;
-
+
-                /* Encode */
-                return (PICT(a,c));
@@ -388 +388 @@
-}
-
-
-/*
- * Hack -- Random hallucination
- */
-static u16b image_random(void)
-{
-        /* Normally, assume monsters */
-        if (rand_int(100) < 75)
-        {
-                return (image_monster());
-        }
-
-        /* Otherwise, assume objects */
-        else
-        {
-                return (image_object());
-        }
-}
-
-
@@ -649 +631 @@
-        if (g->first_k_idx)
-        {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                        
+                        a = PICT_A(i);
+                        c = PICT_C(i);
+                }
+                else
+                {
+                        object_kind *k_ptr = &k_info[g->first_k_idx];
+                        
+                        /* Normal attr and char */
-                        a = k_ptr->x_attr;
-                        c = k_ptr->x_char;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (g->m_idx > 0)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
@@ -739 +743 @@
-
-        /* Handle "player" */
-m_idx < 0
+is_player
-        {
-                monster_race *r_ptr = &r_info[0];
@@ -802 +806 @@
- *    Note that lighting is always LIGHT_GLOW for known "interesting" grids
- *    like walls.
+ *  - g->is_player is TRUE if the player is on the given grid.
+ *  - g->hallucinate is TRUE if the player is hallucinating something "strange"
+ *    for this grid - this should pick a random monster to show if the m_idx
+ *    is non-zero, and a random object if first_k_idx is non-zero.
- *       
- * NOTES:
@@ -822 +830 @@
-        object_type *o_ptr;
-        byte info = cave_info[y][x];
-
-
-
-
-
+
-        /* Default "clear" values, others will be set later where appropriate. */
-        g->first_k_idx = 0;
@@ -832 +836 @@
-        g->lighting = LIGHT_GLOW;
-
-
-
+
-        g->f_idx = cave_feat[y][x];
-
-#if HALLUCINATION_SUPPORT
-        /* Hack -- rare random hallucination on non-outer walls */
-        if (image && (!rand_int(256)) && (g->f_idx < FEAT_PERM_SOLID))
-        {
-                int i = image_random();
-
-                a = PICT_A(i);
-                c = PICT_C(i);
-        }
-#endif
-
-        g->in_view = (info & CAVE_SEEN) ? TRUE : FALSE;
+        g->is_player = (cave_m_idx[y][x] < 0) ? TRUE : FALSE;
+        g->m_idx = (g->is_player) ? 0 : cave_m_idx[y][x];
+        g->hallucinate = p_ptr->timed[TMD_IMAGE] ? TRUE : FALSE;
-
-        /* If the grid is memorised or can currently be seen */
@@ -875 +869 @@
-                                g->lighting = LIGHT_DARK;
-                }
-                else
-                {
-                }
-        }
-        /* Unknown */
@@ -893 +884 @@
-                if (o_ptr->marked && !squelch_hide_item(o_ptr))
-                {
-#ifdef HALLUCINATION_SUPPORT
-                        /* Hack -- object hallucination */
-                        if (image)
-                        {
-                                int i = image_object();
-
-                                a = PICT_A(i);
-                                c = PICT_C(i);
-
-                                break;
-                        }
-#endif
-                        /* First item found */
-                        if (g->first_k_idx == 0)
@@ -920 +899 @@
-        }
-
-
-
-/* Monsters */
-if (g->m_idx > 0
-
-/* Hack -- monster hallucination
-if (image
-
-int i = image_monster()
-
-a = PICT_A(i);
-c = PICT_C(i);
-}
-}
-
-
-/* Handle the player */
-if (g->m_idx < 0)
-{
-g->m_idx = -1;
+
+
+{
+       if (rand_int(256) == 0 && g->f_idx < FEAT_PERM_SOLID
+       
+       /* Normally, make an imaginary monster
+       if (rand_int(100) < 75
+       
+       g->m_idx = 1
+}
+/* Otherwise, an imaginary object */
+else
+       {
+                       g->first_k_idx = 1;
+
+
+       else
+       {
+               g->hallucinate = FALSE;
+}
-        }
-}