Changeset 1405 for trunk

Timestamp:

05/23/09 02:05:00 (10 months ago)

Author:

takkaria

Message:

• (#829) Remove now-unnecessary duplication in init1.c
• Make struct player_race use arrays for flags
• Move all player-related types into player/types.h

Location:

trunk/src

Files:

• externs.h (modified) (1 diff)
• files.c (modified) (4 diffs)
• init1.c (modified) (8 diffs)
• player/calcs.c (modified) (1 diff)
• player/types.h (modified) (1 diff)
• spells2.c (modified) (1 diff)
• types.h (modified) (3 diffs)

trunk/src/externs.h

@@ -322 +322 @@
 /* files.c */
 extern void html_screenshot(cptr name, int mode);
-extern void player_flags(u32b *f1, u32b *f2, u32b *f3);
+extern void player_flags(u32b f[OBJ_FLAG_N]);
 extern void display_player(int mode);
 extern void display_player_stat_info(void);

trunk/src/files.c

@@ -105 +105 @@
  * Obtain the "flags" for the player as if he was an item
  */
-void player_flags(u32b *f1, u32b *f2, u32b *f3)
-{
-        /* Clear */
-        (*f1) = (*f2) = (*f3) = 0L;
-
+void player_flags(u32b f[OBJ_FLAG_N])
+{
         /* Add racial flags */
-        (*f1) |= rp_ptr->flags1;
-        (*f2) |= rp_ptr->flags2;
-        (*f3) |= rp_ptr->flags3;
+        memcpy(f, rp_ptr->flags, sizeof(rp_ptr->flags));
 
         /* Some classes become immune to fear at a certain plevel */
-        if (cp_ptr->flags & CF_BRAVERY_30)
-        {
-                if (p_ptr->lev >= 30) (*f2) |= (TR1_RES_FEAR);
-        }
+        if ((cp_ptr->flags & CF_BRAVERY_30) && p_ptr->lev >= 30)
+                f[1] |= TR1_RES_FEAR;
 }
 
@@ -245 +238 @@
                         else
                         {
-                                player_flags(&f[0], &f[1], &f[2]);
+                                player_flags(f);
 
                                 /* If the race has innate infravision, force the corresponding flag
@@ -251 +244 @@
                                    function will think the infravision is caused by equipment. */
                                 if (rp_ptr->infra > 0)
-                                {
                                         f[0] |= (TR0_INFRA);
-                                }
                         }
 
@@ -470 +461 @@
 
         /* Player flags */
-        player_flags(&f[0], &f[1], &f[2]);
+        player_flags(&f);
 
         /* Check stats */

trunk/src/init1.c

@@ -1390 +1390 @@
  * Grab one flag in an object_kind from a textual string
  */
-static errr grab_one_kind_flag(object_kind *k_ptr, cptr what)
-{
-        if (grab_one_flag(&k_ptr->flags[0], k_info_flags1, what) == 0)
-                return (0);
-
-        if (grab_one_flag(&k_ptr->flags[1], k_info_flags2, what) == 0)
-                return (0);
-
-        if (grab_one_flag(&k_ptr->flags[2], k_info_flags3, what) == 0)
+static errr grab_one_object_flag(u32b flags[OBJ_FLAG_N], cptr what)
+{
+        if (grab_one_flag(&flags[0], k_info_flags1, what) == 0 &&
+                        grab_one_flag(&flags[1], k_info_flags2, what) == 0 &&
+                        grab_one_flag(&flags[2], k_info_flags3, what) == 0)
                 return (0);
 
@@ -1645 +1641 @@
 
                         /* Parse this entry */
-                        if (0 != grab_one_kind_flag(k_ptr, s))
+                        if (0 != grab_one_object_flag(k_ptr->flags, s))
                                 return (PARSE_ERROR_INVALID_FLAG);
 
@@ -1687 +1683 @@
 }
 
-
-/*
- * Grab one flag in an artifact_type from a textual string
- */
-static errr grab_one_artifact_flag(artifact_type *a_ptr, cptr what)
-{
-        if (grab_one_flag(&a_ptr->flags[0], k_info_flags1, what) == 0)
-                return (0);
-
-        if (grab_one_flag(&a_ptr->flags[1], k_info_flags2, what) == 0)
-                return (0);
-
-        if (grab_one_flag(&a_ptr->flags[2], k_info_flags3, what) == 0)
-                return (0);
-
-        /* Oops */
-        msg_format("Unknown artifact flag '%s'.", what);
-
-        /* Error */
-        return (PARSE_ERROR_INVALID_FLAG);
-}
 
 
@@ -1866 +1841 @@
 
                         /* Parse this entry */
-                        if (0 != grab_one_artifact_flag(a_ptr, s))
+                        if (0 != grab_one_object_flag(a_ptr->flags, s))
                                 return (PARSE_ERROR_INVALID_FLAG);
 
@@ -1920 +1895 @@
         return (0);
 }
-
-
-/*
- * Grab one flag in a ego-item_type from a textual string
- */
-static bool grab_one_ego_item_flag(ego_item_type *e_ptr, cptr what)
-{
-        if (grab_one_flag(&e_ptr->flags[0], k_info_flags1, what) == 0)
-                return (0);
-
-        if (grab_one_flag(&e_ptr->flags[1], k_info_flags2, what) == 0)
-                return (0);
-
-        if (grab_one_flag(&e_ptr->flags[2], k_info_flags3, what) == 0)
-                return (0);
-
-        /* Oops */
-        msg_format("Unknown ego-item flag '%s'.", what);
-
-        /* Error */
-        return (PARSE_ERROR_INVALID_FLAG);
-}
-
 
 
@@ -2098 +2050 @@
 
                         /* Parse this entry */
-                        if (0 != grab_one_ego_item_flag(e_ptr, s))
+                        if (0 != grab_one_object_flag(e_ptr->flags, s))
                                 return (PARSE_ERROR_INVALID_FLAG);
 
@@ -2445 +2397 @@
 }
 
-
-/*
- * Grab one flag in a player_race from a textual string
- */
-static errr grab_one_racial_flag(player_race *pr_ptr, cptr what)
-{
-        if (grab_one_flag(&pr_ptr->flags1, k_info_flags1, what) == 0)
-                return (0);
-
-        if (grab_one_flag(&pr_ptr->flags2, k_info_flags2, what) == 0)
-                return (0);
-
-        if (grab_one_flag(&pr_ptr->flags3, k_info_flags3, what) == 0)
-                return (0);
-
-        /* Oops */
-        msg_format("Unknown player flag '%s'.", what);
-
-        /* Error */
-        return (PARSE_ERROR_INVALID_FLAG);
-}
 
 /*
@@ -2682 +2613 @@
 
                         /* Parse this entry */
-                        if (0 != grab_one_racial_flag(pr_ptr, s))
+                        if (0 != grab_one_object_flag(pr_ptr->flags, s))
                                 return (PARSE_ERROR_INVALID_FLAG);
 

trunk/src/player/calcs.c

@@ -613 +613 @@
 
         /* Extract the player flags */
-        player_flags(&collect_f[0], &collect_f[1], &collect_f[2]);
+        player_flags(collect_f);
 
 

trunk/src/player/types.h

@@ -245 +245 @@
 } player_type;
 
+
+
+
+/*
+ * Player sex info
+ */
+typedef struct
+{
+        cptr title;                     /* Type of sex */
+        cptr winner;            /* Name of winner */
+} player_sex;
+
+
+/*
+ * Player racial info
+ */
+typedef struct
+{
+        u32b name;                      /* Name (offset) */
+        u32b text;                      /* Text (offset) */
+        
+        s16b r_adj[A_MAX];      /* Racial stat bonuses */
+        
+        s16b r_skills[SKILL_MAX];       /* racial skills */
+        
+        byte r_mhp;                     /* Race hit-dice modifier */
+        byte r_exp;                     /* Race experience factor */
+        
+        byte b_age;                     /* base age */
+        byte m_age;                     /* mod age */
+        
+        byte m_b_ht;            /* base height (males) */
+        byte m_m_ht;            /* mod height (males) */
+        byte m_b_wt;            /* base weight (males) */
+        byte m_m_wt;            /* mod weight (males) */
+        
+        byte f_b_ht;            /* base height (females) */
+        byte f_m_ht;            /* mod height (females) */
+        byte f_b_wt;            /* base weight (females) */
+        byte f_m_wt;            /* mod weight (females) */
+        
+        byte infra;                     /* Infra-vision range */
+        
+        byte choice;            /* Legal class choices */
+        
+        s16b hist;                      /* Starting history index */
+        
+        u32b flags[OBJ_FLAG_N]; /* Racial flags */
+} player_race;
+
+
+/*
+ * Starting equipment entry
+ */
+typedef struct
+{
+        byte tval;      /* Item's tval */
+        byte sval;      /* Item's sval */
+        byte min;       /* Minimum starting amount */
+        byte max;       /* Maximum starting amount */
+} start_item;
+
+
+/*
+ * A structure to hold class-dependent information on spells.
+ */
+typedef struct
+{
+        byte slevel;            /* Required level (to learn) */
+        byte smana;                     /* Required mana (to cast) */
+        byte sfail;                     /* Minimum chance of failure */
+        byte sexp;                      /* Encoded experience bonus */
+} magic_type;
+
+
+/*
+ * Information about the player's "magic"
+ *
+ * Note that a player with a "spell_book" of "zero" is illiterate.
+ */
+typedef struct
+{
+        magic_type info[PY_MAX_SPELLS]; /* The available spells */
+} player_magic;
+
+
+/*
+ * Player class info
+ */
+typedef struct
+{
+        u32b name;                      /* Name (offset) */
+        
+        u32b title[10];         /* Titles - offset */
+        
+        s16b c_adj[A_MAX];      /* Class stat modifier */
+        
+        s16b c_skills[SKILL_MAX];       /* class skills */
+        s16b x_skills[SKILL_MAX];       /* extra skills */
+        
+        s16b c_mhp;                     /* Class hit-dice adjustment */
+        s16b c_exp;                     /* Class experience factor */
+        
+        u32b flags;                     /* Class Flags */
+        
+        u16b max_attacks;       /* Maximum possible attacks */
+        u16b min_weight;        /* Minimum weapon weight for calculations */
+        u16b att_multiply;      /* Multiplier for attack calculations */
+        
+        byte spell_book;        /* Tval of spell books (if any) */
+        u16b spell_stat;        /* Stat for spells (if any) */
+        u16b spell_first;       /* Level of first spell */
+        u16b spell_weight;      /* Weight that hurts spells */
+        
+        u32b sense_base;        /* Base pseudo-id value */
+        u16b sense_div;         /* Pseudo-id divisor */
+        
+        start_item start_items[MAX_START_ITEMS];/**< The starting inventory */
+        
+        player_magic spells; /* Magic spells */
+} player_class;
+
+
+/*
+ * Player background information
+ */
+typedef struct
+{
+        u32b text;                          /* Text (offset) */
+        
+        byte roll;                          /* Frequency of this entry */
+        byte chart;                         /* Chart index */
+        byte next;                          /* Next chart index */
+        byte bonus;                         /* Social Class Bonus + 50 */
+} hist_type;
+
+
+
+/*
+ * Some more player information
+ *
+ * This information is retained across player lives
+ */
+typedef struct
+{
+        char full_name[32];             /* Full name */
+        char base_name[32];             /* Base name */
+        
+        bool opt[OPT_MAX];              /* Options */
+        
+        u32b window_flag[ANGBAND_TERM_MAX];     /* Window flags */
+        
+        byte hitpoint_warn;             /* Hitpoint warning (0 to 9) */
+        
+        byte delay_factor;              /* Delay factor (0 to 9) */
+} player_other;
+
+
+
 #endif /* INCLUDED_PLAYER_TYPES_H */

trunk/src/spells2.c

@@ -431 +431 @@
 
         /* And flags from the player */
-        player_flags(&t[0], &t[1], &t[2]);
+        player_flags(t);
 
         /* Extract flags */

trunk/src/types.h

@@ -43 +43 @@
 typedef struct owner_type owner_type;
 typedef struct store_type store_type;
-typedef struct magic_type magic_type;
-typedef struct player_magic player_magic;
 typedef struct spell_type spell_type;
-typedef struct player_sex player_sex;
-typedef struct player_race player_race;
-typedef struct player_class player_class;
-typedef struct hist_type hist_type;
-typedef struct player_other player_other;
-typedef struct start_item start_item;
 typedef struct autoinscription autoinscription;
 typedef struct history_info history_info;
@@ -175 +167 @@
 
 
-
-/*
- * A structure to hold class-dependent information on spells.
- */
-struct magic_type
-{
-        byte slevel;            /* Required level (to learn) */
-        byte smana;                     /* Required mana (to cast) */
-        byte sfail;                     /* Minimum chance of failure */
-        byte sexp;                      /* Encoded experience bonus */
-};
-
-
-/*
- * Information about the player's "magic"
- *
- * Note that a player with a "spell_book" of "zero" is illiterate.
- */
-struct player_magic
-{
-        magic_type info[PY_MAX_SPELLS]; /* The available spells */
-};
-
-
 /*
  * And here's the structure for the "fixed" spell information
@@ -213 +181 @@
 
         byte spell_index;       /* Index into player_magic array */
-};
-
-
-/*
- * Player sex info
- */
-struct player_sex
-{
-        cptr title;                     /* Type of sex */
-
-        cptr winner;            /* Name of winner */
-};
-
-
-/*
- * Player racial info
- */
-struct player_race
-{
-        u32b name;                      /* Name (offset) */
-        u32b text;                      /* Text (offset) */
-
-        s16b r_adj[A_MAX];      /* Racial stat bonuses */
-
-        s16b r_skills[SKILL_MAX];       /* racial skills */
-
-        byte r_mhp;                     /* Race hit-dice modifier */
-        byte r_exp;                     /* Race experience factor */
-
-        byte b_age;                     /* base age */
-        byte m_age;                     /* mod age */
-
-        byte m_b_ht;            /* base height (males) */
-        byte m_m_ht;            /* mod height (males) */
-        byte m_b_wt;            /* base weight (males) */
-        byte m_m_wt;            /* mod weight (males) */
-
-        byte f_b_ht;            /* base height (females) */
-        byte f_m_ht;            /* mod height (females) */
-        byte f_b_wt;            /* base weight (females) */
-        byte f_m_wt;            /* mod weight (females) */
-
-        byte infra;                     /* Infra-vision range */
-
-        byte choice;            /* Legal class choices */
-
-        s16b hist;                      /* Starting history index */
-
-        u32b flags1;            /* Racial Flags, set 1 */
-        u32b flags2;            /* Racial Flags, set 2 */
-        u32b flags3;            /* Racial Flags, set 3 */
-};
-
-
-/*
- * Starting equipment entry
- */
-struct start_item
-{
-        byte tval;      /* Item's tval */
-        byte sval;      /* Item's sval */
-        byte min;       /* Minimum starting amount */
-        byte max;       /* Maximum starting amount */
-};
-
-
-/*
- * Player class info
- */
-struct player_class
-{
-        u32b name;                      /* Name (offset) */
-
-        u32b title[10];         /* Titles - offset */
-
-        s16b c_adj[A_MAX];      /* Class stat modifier */
-
-        s16b c_skills[SKILL_MAX];       /* class skills */
-        s16b x_skills[SKILL_MAX];       /* extra skills */
-
-        s16b c_mhp;                     /* Class hit-dice adjustment */
-        s16b c_exp;                     /* Class experience factor */
-
-        u32b flags;                     /* Class Flags */
-
-        u16b max_attacks;       /* Maximum possible attacks */
-        u16b min_weight;        /* Minimum weapon weight for calculations */
-        u16b att_multiply;      /* Multiplier for attack calculations */
-
-        byte spell_book;        /* Tval of spell books (if any) */
-        u16b spell_stat;        /* Stat for spells (if any) */
-        u16b spell_first;       /* Level of first spell */
-        u16b spell_weight;      /* Weight that hurts spells */
-
-        u32b sense_base;        /* Base pseudo-id value */
-        u16b sense_div;         /* Pseudo-id divisor */
-
-        start_item start_items[MAX_START_ITEMS];/**< The starting inventory */
-
-        player_magic spells; /* Magic spells */
-};
-
-
-/*
- * Player background information
- */
-struct hist_type
-{
-        u32b text;                          /* Text (offset) */
-
-        byte roll;                          /* Frequency of this entry */
-        byte chart;                         /* Chart index */
-        byte next;                          /* Next chart index */
-        byte bonus;                         /* Social Class Bonus + 50 */
-};
-
-
-
-/*
- * Some more player information
- *
- * This information is retained across player lives
- */
-struct player_other
-{
-        char full_name[32];             /* Full name */
-        char base_name[32];             /* Base name */
-
-        bool opt[OPT_MAX];              /* Options */
-
-        u32b window_flag[ANGBAND_TERM_MAX];     /* Window flags */
-
-        byte hitpoint_warn;             /* Hitpoint warning (0 to 9) */
-
-        byte delay_factor;              /* Delay factor (0 to 9) */
 };