Changeset 1425

Timestamp:

06/01/09 19:01:29 (10 months ago)

Author:

magnate

Message:

Some further refinements to the visible monster list, per discussion on Oook.

Location:

trunk/src/monster

Files:

• monster2.c (modified) (7 diffs)
• types.h (modified) (1 diff)

trunk/src/monster/monster2.c

@@ -627 +627 @@
                         list[m_ptr->r_idx].los++;
                         
-                        /* Check if awake and increment accordingly */
-                        if (!m_ptr->csleep) list[m_ptr->r_idx].los_awake++;
-                }
-                /* Not in LOS so increment if awake */
-                else if (!m_ptr->csleep) list[m_ptr->r_idx].awake++;
+                        /* Check if asleep and increment accordingly */
+                        if (m_ptr->csleep) list[m_ptr->r_idx].los_asleep++;
+                }
+                /* Not in LOS so increment if asleep */
+                else if (m_ptr->csleep) list[m_ptr->r_idx].asleep++;
 
                 /* Bump the count for this race, and the total count */
@@ -699 +699 @@
         }
 
-        /* Message for monsters in LOS */
-        prt(format("You can see %d monster%s", los_count, 
-                (los_count > 0 ? (los_count == 1 ? ":" : "s:") : "s.")), 0, 0);
+        /* Message for monsters in LOS - even if there are none */
+        if (!los_count) prt(format("You can see no monsters."), 0, 0);
+        else prt(format("You can see %d monster%s", los_count, (los_count == 1
+                ? ":" : "s:")), 0, 0);
 
         /* Print out in-LOS monsters in descending order */
@@ -729 +730 @@
                 /* Build the monster name */
                 if (list[order[i]].los == 1)
-                        strnfmt(buf, sizeof(buf), (list[order[i]].los_awake ==
-                        1 ? "%s (awake) " : "%s (asleep) "), m_name);
-                else strnfmt(buf, sizeof(buf), "%s (x%d, %d awake) ", m_name, 
-                        list[order[i]].los, list[order[i]].los_awake);
+                        strnfmt(buf, sizeof(buf), (list[order[i]].los_asleep ==
+                        1 ? "%s (asleep) " : "%s "), m_name);
+                else strnfmt(buf, sizeof(buf), (list[order[i]].los_asleep > 0 ?
+                        "%s (x%d, %d asleep) " : "%s (x%d)"), m_name, 
+                        list[order[i]].los, list[order[i]].los_asleep);
 
                 /* Display the pict */
@@ -751 +753 @@
                         /* Clear the screen */
                         for (line = 1; line <= max; line++)
-                                prt("", line, x);
+                                prt("", line, 0);
 
                         /* Reprint Message */
@@ -763 +765 @@
         }
 
-        /* Message for monsters outside LOS */
-        prt(format("You are aware of %d %smonster%s", 
+        /* Message for monsters outside LOS, if there are any */
+        if (total_count > los_count)
+        {
+                /* Leave a blank line */
+                line++;
+                
+                prt(format("You are aware of %d %smonster%s", 
                 (total_count - los_count), (los_count > 0 ? "other " : ""), 
-                ((total_count - los_count) > 0 ? ((total_count - los_count) ==
-                1 ? ":" : "s:") : "s.")), line++, 0);
+                ((total_count - los_count) == 1 ? ":" : "s:")), line++, 0);
+        }
 
         /* Print out non-LOS monsters in descending order */
@@ -795 +802 @@
                 /* Build the monster name */
                 if ((list[order[i]].count - list[order[i]].los) == 1)
-                        strnfmt(buf, sizeof(buf), (list[order[i]].awake ==
-                        1 ? "%s (awake) " : "%s (asleep) "), m_name);
-                else strnfmt(buf, sizeof(buf), "%s (x%d, %d awake) ", m_name, 
+                        strnfmt(buf, sizeof(buf), (list[order[i]].asleep ==
+                        1 ? "%s (asleep) " : "%s "), m_name);
+                else strnfmt(buf, sizeof(buf), (list[order[i]].asleep > 0 ? 
+                        "%s (x%d, %d asleep) " : "%s (x%d) "), m_name, 
                         (list[order[i]].count - list[order[i]].los),
-                        list[order[i]].awake);
+                        list[order[i]].asleep);
 
                 /* Display the pict */
@@ -818 +826 @@
                         /* Clear the screen */
                         for (line = 1; line <= max; line++)
-                                prt("", line, x);
+                                prt("", line, 0);
 
                         /* Reprint Message */
-                        prt(format("You can see %d %smonster%s",
+                        prt(format("You are aware of %d %smonster%s",
                                 (total_count - los_count), (los_count > 0 ?
                                 "other " : ""), ((total_count - los_count) > 0

trunk/src/monster/types.h

@@ -161 +161 @@
 {
         u16b count;             /* total number of this type visible */
-        u16b awake;             /* number awake */
+        u16b asleep;            /* number asleep (not in LOS) */
         u16b los;               /* number in LOS */
-        u16b los_awake;         /* number awake and in LOS */
+        u16b los_asleep;        /* number asleep and in LOS */
 } monster_vis;