Changeset 968

Timestamp:

06/28/08 06:52:33 (5 months ago)

Author:

takkaria

Message:

Clean up character dumps a bit.

Files:

• trunk/src/files.c (modified) (2 diffs)
• trunk/src/obj-info.c (modified) (6 diffs)
• trunk/src/object.h (modified) (1 diff)

trunk/src/files.c

@@ -1971 +1971 @@
-
-                        file_putf(fp, "%c) %s\n", index_to_label(i), o_name);
- && object_info_known(&inventory[i])
-file_putf(fp, "\n"
+
+object_info_chardump(&inventory[i]
-                }
-                file_putf(fp, "\n\n");
@@ -1986 +1986 @@
-
-                file_putf(fp, "%c) %s\n", index_to_label(i), o_name);
-known
+chardump
-        }
-        file_putf(fp, "\n\n");

trunk/src/obj-info.c

@@ -451 +451 @@
- * Describe things that look like lights.
- */
-
+, bool terse
-{
-        int rad = 0;
@@ -478 +478 @@
-        text_out(".");
-
-
+!terse && 
-        {
-                const char *name = (o_ptr->sval == SV_LITE_TORCH) ? "torch" : "lantern";
@@ -496 +496 @@
- * Describe an object's activation, if any.
- */
-
+, bool all
-{
-        const object_kind *k_ptr = &k_info[o_ptr->k_idx];
@@ -530 +530 @@
-        if (!desc) return FALSE;
-
+        if (all == FALSE && !(f3 & TR3_ACTIVATE)) return FALSE;
+
-        text_out("When ");
+        text_out(" (all = %d, %d) ", all, (f3 & TR3_ACTIVATE) ? 1 : 0);
-
-        if (f3 & TR3_ACTIVATE)
@@ -615 +618 @@
-        if (something) text_out("\n");
-
-
-
+, TRUE
+, FALSE
-
-        return something;
@@ -727 +730 @@
-
-
+bool object_info_chardump(const object_type *o_ptr)
+{
+        u32b f1, f2, f3;
+        bool something = FALSE;
+
+        /* Grab the object flags */
+        object_flags_known(o_ptr, &f1, &f2, &f3);
+
+
+        if (cursed_p(o_ptr))
+        {
+                if (f3 & TR3_PERMA_CURSE)
+                        text_out_c(TERM_L_RED, "Permanently cursed.\n");
+                else if (f3 & TR3_HEAVY_CURSE)
+                        text_out_c(TERM_L_RED, "Heavily cursed.\n");
+                else if (object_known_p(o_ptr))
+                        text_out_c(TERM_L_RED, "Cursed.\n");
+        }
+
+        if (describe_stats(f1, o_ptr->pval)) something = TRUE;
+        if (describe_immune(f2)) something = TRUE;
+        if (describe_ignores(f3)) something = TRUE;
+        if (describe_sustains(f2)) something = TRUE;
+        if (describe_misc_magic(f3)) something = TRUE;
+
+        if (describe_activation(o_ptr, f3, FALSE, FALSE)) something = TRUE;
+        if (describe_light(o_ptr, f3, TRUE)) something = TRUE;
+
+        /* Describe combat bits */
+        if (describe_combat(o_ptr, FALSE)) something = TRUE;
+
+        return something;
+}
+
-bool object_info_known(const object_type *o_ptr)
-{

trunk/src/object.h

@@ -57 +57 @@
-void object_info_header(const object_type *o_ptr);
-bool object_info_known(const object_type *o_ptr);
+bool object_info_chardump(const object_type *o_ptr);
-bool object_info_full(const object_type *o_ptr);
-bool object_info_store(const object_type *o_ptr);