Changeset 490

Timestamp:

08/11/07 10:27:11 (1 year ago)

Author:

ajps

Message:

map_info now determines if we can see a monster, not the displaying function.

Files:

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

trunk/src/cave.c

@@ -672 +672 @@
-                {
-                        monster_type *m_ptr = &mon_list[g->m_idx];
+                        monster_race *r_ptr = &r_info[m_ptr->r_idx];
+                                
+                        byte da;
+                        char dc;
-                        
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                
-
-
+
+
+
+
+
+
+
+
+
-                                
+                                /* Normal char */
+                                c = dc;
+                        }
+                        
+                        /* Normal monster (not "clear" in any way) */
+                        else if (!(r_ptr->flags1 & (RF1_ATTR_CLEAR | RF1_CHAR_CLEAR)))
+                        {
+                                /* Use attr */
+                                a = da;
+
-                                /* Desired attr & char */
-                                da = r_ptr->x_attr;
-                                dc = r_ptr->x_char;
-                                
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        a = da;
-                                        
-                                        /* Use char */
-                                        c = dc;
-                                }
-                                
-                                /* Multi-hued monster */
-                                else if (r_ptr->flags1 & (RF1_ATTR_MULTI))
-                                {
-                                        /* Multi-hued attr */
-                                        a = randint(15);
-                                        
-                                        /* Normal char */
-                                        c = dc;
-                                }
-                                
-                                /* Normal monster (not "clear" in any way) */
-                                else if (!(r_ptr->flags1 & (RF1_ATTR_CLEAR | RF1_CHAR_CLEAR)))
-                                {
-                                        /* Use attr */
-                                        a = da;
-                                        
-                                        /* Use char */
-                                        c = dc;
-                                }
-                                
-                                /* Hack -- Bizarre grid under monster */
-                                else if ((a & 0x80) || (c & 0x80))
-                                {
-                                        /* Use attr */
-                                        a = da;
-                                        
-                                        /* Use char */
-                                        c = dc;
-                                }
-                                
-                                /* Normal char, Clear attr, monster */
-                                else if (!(r_ptr->flags1 & (RF1_CHAR_CLEAR)))
-                                {
-                                        /* Normal char */
-                                        c = dc;
-                                }
-                                
-                                /* Normal attr, Clear char, monster */
-                                else if (!(r_ptr->flags1 & (RF1_ATTR_CLEAR)))
-                                {
-                                        /* Normal attr */
-                                        a = da;
-                                }
-                        }
-                }
@@ -849 +848 @@
- * terrain may be objects, monsters, or stay the same.
- */
-#undef HALLUCINATION_SUPPORT /* needs to be generalised. */
-void map_info(unsigned y, unsigned x, grid_data *g)
-{
@@ -926 +924 @@
-                        }
-                }
+        }
+
+        /* Monsters */
+        if (g->m_idx > 0)
+        {
+                /* If the monster isn't "visible", make sure we don't list it.*/
+                monster_type *m_ptr = &mon_list[g->m_idx];
+                if (!m_ptr->ml) g->m_idx = 0;
+
-        }
-