Changeset 55

Timestamp:

04/21/07 18:09:39 (2 years ago)

Author:

takkaria

Message:

• Move some things out of defines.h to better places
  
• Fix truncated options display
  
• Fix store owner display
  

Files:

• trunk/src/cmd4.c (modified) (2 diffs)
• trunk/src/config.h (modified) (1 diff)
• trunk/src/defines.h (modified) (1 diff)
• trunk/src/h-basic.h (modified) (1 diff)
• trunk/src/store.c (modified) (2 diffs)

trunk/src/cmd4.c

@@ -2059 +2059 @@
-{
-        byte attr = curs_attrs[CURS_KNOWN][(int)cursor];
-8
+5
-                                                option_desc[oid],
-                                                op_ptr->opt[oid] ? "yes" : "no ",
@@ -2117 +2117 @@
-        for (i = 0; i < OPT_PAGE_PER; i++)
-        {
-255
+OPT_NONE
-                {
-                        opt[n++] = option_page[page][i];

trunk/src/config.h

@@ -392 +392 @@
-
-
+/*
+ * HACK - define if the source contains the cleanup_angband() function.
+ */
+#define HAS_CLEANUP
+
+
-
-/*

trunk/src/defines.h

@@ -3164 +3164 @@
-
-#define ACT_MAX                 50
-
-/*
- * HACK - define if the source contains the cleanup_angband() function.
- */
-#define HAS_CLEANUP
-
-
-/*
- * Given an array, determine how many elements are in the array.
- */
-#define N_ELEMENTS(a) (sizeof(a) / sizeof((a)[0]))

trunk/src/h-basic.h

@@ -155 +155 @@
-
-
+/*** Useful array length macro ***/
+
+/*
+ * Given an array, determine how many elements are in the array.
+ */
+#define N_ELEMENTS(a) (sizeof(a) / sizeof((a)[0]))
+
-
-/*** Some hackish character manipulation ***/

trunk/src/store.c

@@ -1753 +1753 @@
-        {
-                /* Put the owner name */
-2
+1
-
-                /* Label the object descriptions */
@@ -1774 +1774 @@
-                /* Put the owner name and race */
-                strnfmt(buf, sizeof(buf), "%s (%s)", owner_name, race_name);
-2
+1
-
-                /* Show the max price in the store (above prices) */