Changeset 274

Timestamp:

07/04/07 17:12:31 (1 year ago)

Author:

ajps

Message:

Improvements to object knowledge screen, including preventing autoinscriptions giving an unfair advantage. Closes #189.

Files:

• trunk/src/cmd1.c (modified) (1 diff)
• trunk/src/cmd4.c (modified) (5 diffs)
• trunk/src/externs.h (modified) (2 diffs)
• trunk/src/object1.c (modified) (3 diffs)
• trunk/src/squelch.c (modified) (1 diff)
• trunk/src/wizard2.c (modified) (2 diffs)

trunk/src/cmd1.c

@@ -579 +579 @@
-
-                        /* Get the object name */
-strip_name(
+object_kind_name(tmp, sizeof 
-
-                        /* Build up the pickup string */

trunk/src/cmd4.c

@@ -1445 +1445 @@
-        char o_name[80];
-
-
-        /* Choose a color */
-        bool aware = (k_ptr->flavor == 0) || (k_ptr->aware);
@@ -1462 +1461 @@
-
-        /* Tidy name */
-
-
+
-
-        /* Display the name */
@@ -1469 +1467 @@
-
-        /* Show autoinscription if around */
-
+aware && 
-                c_put_str(TERM_YELLOW, inscrip, row, 55);
-
@@ -1576 +1574 @@
-
-        /* Forget it if we've never seen the thing */
-!k_ptr->everseen
+k_ptr->flavor && !k_ptr->aware
-                return "";
-
@@ -1595 +1593 @@
-
-        /* Forget it if we've never seen the thing */
-!k_ptr->everseen
+k_ptr->flavor && !k_ptr->aware
-                return;
-

trunk/src/externs.h

@@ -393 +393 @@
-extern void flavor_init(void);
-extern void reset_visuals(bool prefs);
+extern void object_kind_name(char *buf, size_t max, int k_idx, bool easy_know);
-extern void object_flags(const object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3);
-extern void object_flags_known(const object_type *o_ptr, u32b *f1, u32b *f2, u32b *f3);
@@ -767 +768 @@
-
-bool make_fake_artifact(object_type *o_ptr, byte name1);
-extern void strip_name(char *buf, int k_idx, bool easy_know);

trunk/src/object1.c

@@ -178 +178 @@
-                }
-                buf[titlelen - 1] = '\0';
-
+
-                /* Check the scroll name hasn't already been generated */
-                for (j = 0; j < i; j++)
@@ -188 +188 @@
-                        }
-                }
-
+
-                if (okay)
-                {
@@ -448 +448 @@
-}
-
+
+
+/*
+ * Puts a very stripped-down version of an object's name into buf.
+ * If easy_know is TRUE, then the IDed names are used, otherwise
+ * flavours, scroll names, etc will be used.
+ *
+ * Just truncates if the buffer isn't big enough.
+ */
+void object_kind_name(char *buf, size_t max, int k_idx, bool easy_know)
+{
+        char *t;
+
+        object_kind *k_ptr = &k_info[k_idx];
+
+        /* If not aware, use flavor */
+        if (!easy_know && !k_ptr->aware && k_ptr->flavor)
+        {
+                if (k_ptr->tval == TV_SCROLL)
+                {
+                        strnfmt(buf, max, "\"%s\"", scroll_adj[k_ptr->sval]);
+                }
+                else if (k_ptr->tval == TV_FOOD && k_ptr->sval < SV_FOOD_MIN_FOOD)
+                {
+                        strnfmt(buf, max, "%s Mushroom", flavor_text + flavor_info[k_ptr->flavor].text);
+                }
+                else
+                {
+                        /* Plain flavour (e.g. Copper) will do. */
+                        my_strcpy(buf, flavor_text + flavor_info[k_ptr->flavor].text, max);
+                }
+        }
+        else
+        /* Use proper name (Healing, or whatever) */
+        {
+                cptr str = (k_name + k_ptr->name);
+
+                if (k_ptr->tval == TV_FOOD && k_ptr->sval < SV_FOOD_MIN_FOOD)
+                {
+                        my_strcpy(buf, "Mushroom of ", max);
+                        max -= strlen(buf);
+                        t = buf + strlen(buf);
+                }
+                else
+                {
+                        t = buf;
+                }
+
+                /* Skip past leading characters */
+                while ((*str == ' ') || (*str == '&')) str++;
+
+                /* Copy useful chars */
+                for (; *str && max > 1; str++)
+                {
+                        /* Pluralizer for irregular plurals */
+                        /* Useful for languages where adjective changes for plural */
+                        if (*str == '|')
+                        {
+                                /* Process singular part */
+                                for (str++; *str != '|' && max > 1; str++) 
+                                {
+                                        *t++ = *str;
+                                        max--;
+                                }
+
+                                /* Process plural part */
+                                for (str++; *str != '|'; str++) ;
+                        }
+
+                        /* English plural indicator can simply be skipped */
+                        else if (*str != '~')
+                        {
+                                *t++ = *str;
+                                max--;
+                        }
+                }
+
+                /* Terminate the new name */
+                *t = '\0';
+        }
+}
-
-

trunk/src/squelch.c

@@ -656 +656 @@
-
-        /* Acquire the "name" of object "i" */
-strip_name(buf
+object_kind_name(buf, sizeof(buf)
-
-        /* Print it */

trunk/src/wizard2.c

@@ -413 +413 @@
-
-
-/*
- * Strip an "object name" into a buffer
- */
-void strip_name(char *buf, int k_idx, bool easy_know)
-{
-        char *t;
-
-        object_kind *k_ptr = &k_info[k_idx];
-
-        cptr str = (k_name + k_ptr->name);
-
-    /* If not aware, use flavor */
-    if (!easy_know && !k_ptr->aware && k_ptr->flavor)
-                        str = flavor_text + flavor_info[k_ptr->flavor].text;
-
-
-
-        /* Skip past leading characters */
-        while ((*str == ' ') || (*str == '&')) str++;
-
-        /* Copy useful chars */
-        for (t = buf; *str; str++)
-        {
-                /* Pluralizer for irregular plurals */
-                /* Useful for languages where adjective changes for plural */
-                if (*str == '|')
-                {
-                        /* Process singular part */
-                        for (str++; *str != '|'; str++) *t++ = *str;
-
-                        /* Process plural part */
-                        for (str++; *str != '|'; str++) ;
-                }
-
-                /* English plural indicator can simply be skipped */
-                else if (*str != '~') *t++ = *str;
-        }
-
-        /* Terminate the new name */
-        *t = '\0';
-}
-
-
-/*
@@ -532 +490 @@
-
-                        /* Get the "name" of object "i" */
-strip_name(
+object_kind_name(buf, sizeof 
-
-                        /* Print it */