Changeset 1433 for trunk

Timestamp:

06/08/09 19:19:42 (9 months ago)

Author:

magnate

Message:

Dynastic character numbering support - closes #63

Location:

trunk/src

Files:

• birth.c (modified) (2 diffs)
• externs.h (modified) (1 diff)
• files.c (modified) (2 diffs)
• load-old.c (modified) (1 diff)
• load.c (modified) (1 diff)
• player/types.h (modified) (1 diff)
• save.c (modified) (1 diff)
• util.c (modified) (1 diff)

trunk/src/birth.c

@@ -1006 +1006 @@
         int points_spent[A_MAX];
         int points_left;
+        char *buf;
 
         bool rolled_stats = FALSE;
@@ -1039 +1040 @@
         reset_stats(stats, points_spent, &points_left);
         do_birth_reset(quickstart_allowed, &quickstart_prev);
+
+        /* Handle incrementing name suffix */
+        if (op_ptr->name_suffix)
+        {
+                ++op_ptr->name_suffix;
+                buf = find_roman_suffix_start(op_ptr->full_name);
+                if (buf)
+                {
+                        romanify(op_ptr->name_suffix, buf,
+                                 sizeof(op_ptr->full_name) - (buf - (char *)&op_ptr->full_name));
+                }
+        }
 
         /* We're ready to start the interactive birth process. */

trunk/src/externs.h

@@ -586 +586 @@
 extern void text_to_ascii(char *buf, size_t len, cptr str);
 extern void ascii_to_text(char *buf, size_t len, cptr str);
+extern void romanify(int in, char *buf, size_t len);
+extern char *find_roman_suffix_start(cptr buf);
 extern int macro_find_exact(cptr pat);
 extern errr macro_add(cptr pat, cptr act);

trunk/src/files.c

@@ -1614 +1614 @@
  * when a new character is created, and then when the character is done
  * being created, they call this function to choose a new savefile name.
+ *
+ * This also now handles the turning on and off of the automatic
+ * sequential numbering of character names with Roman numerals.  
  */
 void process_player_name(bool sf)
@@ -1619 +1622 @@
         int i;
 
+        /* If the selected name ends in " I", i.e. "the first", then we're using
+         * Roman numerals style suffices, so set the savefile flag.
+         * Equally if there's no roman numerals at all, switch off suffices.*/
+        char *buf = find_roman_suffix_start(op_ptr->full_name);
+        if (!buf)
+        {
+                op_ptr->name_suffix = 0;
+        }
+        else
+        {
+                if (buf[0] == 'I' && buf[1] == '\0')
+                {
+                        op_ptr->name_suffix = 1;
+                } 
+        }
 
         /* Process the player name */

trunk/src/load-old.c

@@ -782 +782 @@
         sp_ptr = &sex_info[p_ptr->psex];
 
-        strip_bytes(1);
+        /* Numeric name suffix */
+        rd_byte(&op_ptr->name_suffix);
 
         /* Special Race/Class info */

trunk/src/load.c

@@ -664 +664 @@
         sp_ptr = &sex_info[p_ptr->psex];
 
-        strip_bytes(1);
+        /* Numeric name suffix */
+        rd_byte(&op_ptr->name_suffix);
 
         /* Special Race/Class info */

trunk/src/player/types.h

@@ -400 +400 @@
         
         byte delay_factor;              /* Delay factor (0 to 9) */
+        
+        byte name_suffix;               /* numeric suffix for player name */
 } player_other;
 

trunk/src/save.c

@@ -326 +326 @@
         wr_byte(p_ptr->pclass);
         wr_byte(p_ptr->psex);
-        wr_byte(0);     /* oops */
+        wr_byte(op_ptr->name_suffix);
         
         wr_byte(p_ptr->hitdie);

trunk/src/util.c

@@ -469 +469 @@
 }
 
-
+static char *roman_order[] = {"", "a", "aa", "aaa", "ab", "b", "ba", "baa", "baaa", "ac"};
+
+/*
+ * Fill in buf (up to size len) with the roman digits corresponding to the
+ * input digit, based on the radix string specified. This will be the
+ * characters of the current decimal position, e.g. IVX for digits, XLC for
+ * tens, CDM for hundreds.
+ * 
+ * Returns number of chars put in the string.
+ */
+static size_t roman_digits(char *buf, size_t len, int digit, char *radix)
+{
+        char *template = roman_order[digit];
+        size_t radix_len = strlen(radix);
+        size_t added = 0;
+        
+        while (*template && len) {
+                int offset = *template - 'a';
+                if (offset < radix_len)
+                {
+                        *buf = radix[offset];
+                }
+                else
+                {
+                        *buf = '?';
+                }
+                ++buf;
+                ++template;
+                ++added;
+                --len;
+        }
+        return added;
+}
+
+/*
+ * Convert a number into a string in roman numerals
+ * Ignores any value over a thousand, on the grounds that it's hard to 
+ * print characters with bars on top in ASCII...
+ */
+void romanify(int in, char *buf, size_t len)
+{
+        int hundreds = (in / 100) % 10;
+        int tens = (in / 10) % 10;
+        int ones = in % 10;
+        size_t ret;
+        
+        if (hundreds)
+        {
+                ret = roman_digits(buf, len, hundreds, "CDM");
+                buf += ret;
+                len -= ret;
+        }
+        if (tens)
+        {
+                ret = roman_digits(buf, len, tens, "XLC");
+                buf += ret;
+                len -= ret;
+        }
+        if (ones)
+        {
+                ret = roman_digits(buf, len, ones, "IVX");
+                buf += ret;
+                len -= ret;
+        }
+        if (len)
+        {
+                *buf = '\0';
+        }
+}
+
+/*
+ * Find the start of a possible Roman numerals suffix by going back from the
+ * end of the string to a space, then checking that all the remaining chars
+ * are valid Roman numerals.
+ * 
+ * Return the start position, or NULL if there isn't a valid suffix. 
+ */
+char *find_roman_suffix_start(cptr buf)
+{
+        const char *start = strrchr(buf, ' ');
+        const char *p;
+        
+        if (start)
+        {
+                start++;
+                p = start;
+                while (*p)
+                {
+                        if (*p != 'I' && *p != 'V' && *p != 'X' && *p != 'L' &&
+                            *p != 'C' && *p != 'D' && *p != 'M')
+                        {
+                                start = NULL;
+                                break;
+                        }
+                        ++p;                        
+                }
+        }
+        return (char *)start;
+}
 
 /*