Changeset 996

Timestamp:

10/01/08 01:41:31 (2 months ago)

Author:

takkaria

Message:

Move xtra1.c to player/calcs.c, splitting modify_stat_value() out into player/util.c.

Files:

• trunk/src/Makefile.inc (modified) (1 diff)
• trunk/src/Makefile.src (modified) (2 diffs)
• trunk/src/angband.h (modified) (1 diff)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/player (added)
• trunk/src/player/calcs.c (moved) (moved from trunk/src/xtra1.c) (4 diffs, 1 prop)
• trunk/src/player/player.h (added)
• trunk/src/player/types.h (added)
• trunk/src/player/util.c (added)
• trunk/src/types.h (modified) (1 diff)

trunk/src/Makefile.inc

@@ -16 +16 @@
-attack.o: attack.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-birth.o: birth.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
-
+
+
+
-button.o: button.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-monster/types.h ui.h z-type
-
+object/object
+monster/types.h player/types.h store.h ui.h z-type.h 
-cave.o: cave.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
-
+
+
+
-cmd0.o: cmd0.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
-
+
+
+
-cmd1.o: cmd1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  object/tvalsval.h cmds.h
-cmd2.o: cmd2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h monster/types.h ui.h z-type.h externs.h \
-  object/tvalsval.h
-cmd3.o: cmd3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h monster/types.h ui.h z-type.h externs.h \
-  object/tvalsval.h
-cmd4.o: cmd4.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h monster/types.h ui.h z-type.h externs.h \
-  object/tvalsval.h ui-menu.h
-cmd5.o: cmd5.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h monster/types.h ui.h z-type.h externs.h \
-  object/tvalsval.h
-cmd6.o: cmd6.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h monster/types.h ui.h z-type.h externs.h \
-  object/tvalsval.h cmds.h effects.h list-effects.h
-cmd-obj.o: cmd-obj.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h monster/types.h ui.h z-type.h \
-  externs.h object/tvalsval.h cmds.h
-death.o: death.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  ui-menu.h cmds.h
-debug.o: debug.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h monster/types.h ui.h z-type.h externs.h \
-  debug.h
-dungeon.o: dungeon.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h monster/types.h ui.h z-type.h \
-  externs.h object/tvalsval.h cmds.h game-event.h
-effects.o: effects.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-  defines.h option.h types.h object/types.h monster/types.h ui.h z-type.h \
-  externs.h effects.h list-effects.h
-files.o: files.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-  option.h types.h object/types.h monster/types.h ui.h z-type.h externs.h \
-  object/tvalsval.h ui-menu.h cmds.h
-game-cmd.o: game-cmd.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-game-event.o: game-event.c z-virt.h h-basic.h game-event.h
-generate.o: generate.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-monster/types.h ui.h z-type
-
+object/object
+monster/types.h player/types.h store.h ui.h z-type.h 
-history.o: history.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-monster/types.h ui.h z-type
-
+object/object
+monster/types.h player/types.h store.h ui.h z-type.h 
-init1.o: init1.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
-
+
+
+
-init2.o: init2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
-
+
+
+
-load.o: load.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-monster/types.h ui.h z-type.h extern
-
+object/object.h monster/type
+player/types.h store.h ui.h z-type.h externs.h 
-melee1.o: monster/melee1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-melee2.o: monster/melee2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-monster1.o: monster/monster1.c angband.h h-basic.h z-file.h z-form.h \
-  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
-monster/types.h ui
-
+object/object
+monster/types.h player/types.h store.h ui.h 
-monster2.o: monster/monster2.c angband.h h-basic.h z-file.h z-form.h \
-  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
-monster/types.h ui
-
+object/object
+monster/types.h player/types.h store.h ui.h 
-obj-desc.o: object/obj-desc.c angband.h h-basic.h z-file.h z-form.h \
-  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
-
-
+
+
+
-obj-info.o: object/obj-info.c angband.h h-basic.h z-file.h z-form.h \
-  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
-
-
+
+
+
-obj-make.o: object/obj-make.c angband.h h-basic.h z-file.h z-form.h \
-  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
-
-
+
+
+
-obj-ui.o: object/obj-ui.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-obj-util.o: object/obj-util.c angband.h h-basic.h z-file.h z-form.h \
-  z-util.h z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h \
-
-
+
+
+
+
+
+
+
+
-option.o: option.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
-
-
-
-
+
+
-randname.o: randname.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-pathfind.o: pathfind.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
+
+
+
+
-score.o: score.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
-signals.o: signals.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-monster/types.h ui.h z-type
-
+object/object
+monster/types.h player/types.h store.h ui.h z-type.h 
-save.o: save.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
-spells1.o: spells1.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-spells2.o: spells2.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-squelch.o: squelch.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-store.o: store.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
-
+
+
+
-tables.o: tables.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-target.o: target.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-monster/types.h ui.h z-type
-
+object/object
+monster/types.h player/types.h store.h ui.h z-type.h 
-trap.o: trap.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
-ui.o: ui.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
+
+
-ui-birth.o: ui-birth.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-ui-event.o: ui-event.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-monster/types.h ui.h z-type
-
+object/object
+monster/types.h player/types.h store.h ui.h z-type.h 
-ui-menu.o: ui-menu.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-util.o: util.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-monster/types.h ui.h z-type.h extern
-
+object/object.h monster/type
+player/types.h store.h ui.h z-type.h externs.h 
-variable.o: variable.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-monster/types.h ui.h z-type
-
+object/object
+monster/types.h player/types.h store.h ui.h z-type.h 
-wiz-spoil.o: wiz-spoil.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-wiz-stats.o: wiz-stats.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-wizard.o: wizard.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
+
+
+
-x-spell.o: x-spell.c angband.h h-basic.h z-file.h z-form.h z-util.h \
-  z-virt.h z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h \
-
-
-
-
-
-
+
+
+
-xtra2.o: xtra2.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-monster/types.h ui.h z-type.h extern
-
+object/object.h monster/type
+player/types.h store.h ui.h z-type.h externs.h 
-xtra3.o: xtra3.c angband.h h-basic.h z-file.h z-form.h z-util.h z-virt.h \
-  z-rand.h z-term.h ui-event.h z-quark.h z-msg.h config.h defines.h \
-
-
+
+
+
-z-file.o: z-file.c z-file.h h-basic.h z-virt.h z-util.h z-form.h
-z-form.o: z-form.c z-form.h h-basic.h z-type.h z-util.h z-virt.h

trunk/src/Makefile.src

@@ -90 +90 @@
-        randname.o \
-        pathfind.o \
+        player/calcs.o \
+        player/util.o \
-        score.o \
-        signals.o \
@@ -110 +112 @@
-        wizard.o \
-        x-spell.o \
-        xtra1.o \
-        xtra2.o \
-        xtra3.o

trunk/src/angband.h

@@ -39 +39 @@
-#include "object/object.h"
-#include "monster/types.h"
+#include "player/types.h"
+#include "player/player.h"
-#include "store.h"
-

trunk/src/externs.h

@@ -639 +639 @@
-extern bool cast_spell(int tval, int index);
-
-/* xtra1.c */
-s16b modify_stat_value(int value, int amount);
-int calc_blows(const object_type *o_ptr);
-void notice_stuff(void);
-void update_stuff(void);
-void redraw_stuff(void);
-void handle_stuff(void);
-
-/* xtra2.c */
-bool set_timed(int idx, int v);

trunk/src/player/calcs.c

@@ -1 +1 @@
-/*
-xtra1
+player/calcs
- * Purpose: Player status calculation, signalling ui events based on status
- *          changes.
@@ -21 +21 @@
-#include "object/tvalsval.h"
-
-
-struct flag_event_trigger
-{
-        u32b flag;
-        game_event_type event;
-};
-
-/*
- * Modify a stat value by a "modifier", return new value
- *
- * Stats go up: 3,4,...,17,18,18/10,18/20,...,18/220
- * Or even: 18/13, 18/23, 18/33, ..., 18/220
- *
- * Stats go down: 18/220, 18/210,..., 18/10, 18, 17, ..., 3
- * Or even: 18/13, 18/03, 18, 17, ..., 3
- */
-s16b modify_stat_value(int value, int amount)
-{
-        int i;
-
-        /* Reward */
-        if (amount > 0)
-        {
-                /* Apply each point */
-                for (i = 0; i < amount; i++)
-                {
-                        /* One point at a time */
-                        if (value < 18) value++;
-
-                        /* Ten "points" at a time */
-                        else value += 10;
-                }
-        }
-
-        /* Penalty */
-        else if (amount < 0)
-        {
-                /* Apply each point */
-                for (i = 0; i < (0 - amount); i++)
-                {
-                        /* Ten points at a time */
-                        if (value >= 18+10) value -= 10;
-
-                        /* Hack -- prevent weirdness */
-                        else if (value > 18) value = 18;
-
-                        /* One point at a time */
-                        else if (value > 3) value--;
-                }
-        }
-
-        /* Return new value */
-        return (value);
-}
-
-
@@ -1661 +1607 @@
-
-
+struct flag_event_trigger
+{
+        u32b flag;
+        game_event_type event;
+};
+
+
+
-/*
- * Events triggered by the various flags.
@@ -1683 +1637 @@
-        { PR_DTRAP,   EVENT_DETECTIONSTATUS },
-        { PR_BUTTONS, EVENT_MOUSEBUTTONS },
-
+
-        { PR_INVEN,   EVENT_INVENTORY },
-        { PR_EQUIP,   EVENT_EQUIPMENT },

trunk/src/types.h

@@ -352 +352 @@
-
-
-/*
- * Most of the "player" information goes here.
- *
- * This stucture gives us a large collection of player variables.
- *
- * This entire structure is wiped when a new character is born.
- *
- * This structure is more or less laid out so that the information
- * which must be saved in the savefile precedes all the information
- * which can be recomputed as needed.
- */
-struct player_type
-{
-        s16b py;                        /* Player location */
-        s16b px;                        /* Player location */
-
-        byte psex;                      /* Sex index */
-        byte prace;                     /* Race index */
-        byte pclass;            /* Class index */
-        byte oops;                      /* Unused */
-
-        byte hitdie;            /* Hit dice (sides) */
-        byte expfact;           /* Experience factor */
-
-        s16b age;                       /* Characters age */
-        s16b ht;                        /* Height */
-        s16b wt;                        /* Weight */
-        s16b sc;                        /* Social Class */
-
-        s32b au;                        /* Current Gold */
-
-        s16b max_depth;         /* Max depth */
-        s16b depth;                     /* Cur depth */
-
-        s16b max_lev;           /* Max level */
-        s16b lev;                       /* Cur level */
-
-        s32b max_exp;           /* Max experience */
-        s32b exp;                       /* Cur experience */
-        u16b exp_frac;          /* Cur exp frac (times 2^16) */
-
-        s16b mhp;                       /* Max hit pts */
-        s16b chp;                       /* Cur hit pts */
-        u16b chp_frac;          /* Cur hit frac (times 2^16) */
-
-        s16b msp;                       /* Max mana pts */
-        s16b csp;                       /* Cur mana pts */
-        u16b csp_frac;          /* Cur mana frac (times 2^16) */
-
-        s16b stat_max[A_MAX];   /* Current "maximal" stat values */
-        s16b stat_cur[A_MAX];   /* Current "natural" stat values */
-
-        s16b timed[TMD_MAX];    /* Timed effects */
-
-        s16b word_recall;       /* Word of recall counter */
-
-        s16b energy;            /* Current energy */
-
-        s16b food;                      /* Current nutrition */
-
-        byte confusing;         /* Glowing hands */
-        byte searching;         /* Currently searching */
-
-        byte spell_flags[PY_MAX_SPELLS]; /* Spell flags */
-
-        byte spell_order[PY_MAX_SPELLS];        /* Spell order */
-
-        s16b player_hp[PY_MAX_LEVEL];   /* HP Array */
-
-        char died_from[80];             /* Cause of death */
-        char history[250];      /* Initial history */
-
-        u16b total_winner;              /* Total winner */
-        u16b panic_save;                /* Panic save */
-
-        u16b noscore;                   /* Cheating flags */
-
-        bool is_dead;                   /* Player is dead */
-
-        bool wizard;                    /* Player is in wizard mode */
-
-
-        /*** Temporary fields ***/
-
-        bool playing;                   /* True if player is playing */
-
-        bool leaving;                   /* True if player is leaving */
-
-        bool create_up_stair;   /* Create up stair on next level */
-        bool create_down_stair; /* Create down stair on next level */
-
-        s32b total_weight;              /* Total weight being carried */
-
-        s16b inven_cnt;                 /* Number of items in inventory */
-        s16b equip_cnt;                 /* Number of items in equipment */
-
-        s16b health_who;                /* Health bar trackee */
-
-        s16b monster_race_idx;  /* Monster race trackee */
-
-        s16b object_kind_idx;   /* Object kind trackee */
-
-        s16b energy_use;                /* Energy use this turn */
-
-        s16b resting;                   /* Resting counter */
-        s16b running;                   /* Running counter */
-        bool running_withpathfind;      /* Are we using the pathfinder ? */
-
-        s16b run_cur_dir;               /* Direction we are running */
-        s16b run_old_dir;               /* Direction we came from */
-        bool run_unused;                /* Unused (padding field) */
-        bool run_open_area;             /* Looking for an open area */
-        bool run_break_right;   /* Looking for a break (right) */
-        bool run_break_left;    /* Looking for a break (left) */
-
-        s16b command_cmd;               /* Gives identity of current command */
-        s16b command_arg;               /* Gives argument of current command */
-        s16b command_rep;               /* Gives repetition of current command */
-        s16b command_dir;               /* Gives direction of current command */
-        int  command_inv;               /* Gives item of current command */
-        ui_event_data command_cmd_ex; /* Gives additional information of current command */
-
-        s16b command_wrk;               /* See "cmd1.c" */
-        s16b command_new;               /* Hack -- command chaining XXX XXX */
-
-        s16b new_spells;                /* Number of spells available */
-
-        bool cumber_armor;      /* Mana draining armor */
-        bool cumber_glove;      /* Mana draining gloves */
-        bool heavy_wield;       /* Heavy weapon */
-        bool heavy_shoot;       /* Heavy shooter */
-        bool icky_wield;        /* Icky weapon */
-
-        s16b cur_lite;          /* Radius of lite (if any) */
-
-        u32b notice;            /* Special Updates (bit flags) */
-        u32b update;            /* Pending Updates (bit flags) */
-        u32b redraw;            /* Normal Redraws (bit flags) */
-
-        s16b stat_use[A_MAX];   /* Current modified stats */
-        s16b stat_top[A_MAX];   /* Maximal modified stats */
-
-        /*** Extracted fields ***/
-
-        s16b stat_add[A_MAX];   /* Equipment stat bonuses */
-        s16b stat_ind[A_MAX];   /* Indexes into stat tables */
-
-        bool vuln_acid;
-        bool vuln_elec;
-        bool vuln_fire;
-        bool vuln_cold;
-
-        bool immune_acid;       /* Immunity to acid */
-        bool immune_elec;       /* Immunity to lightning */
-        bool immune_fire;       /* Immunity to fire */
-        bool immune_cold;       /* Immunity to cold */
-
-        bool resist_acid;       /* Resist acid */
-        bool resist_elec;       /* Resist lightning */
-        bool resist_fire;       /* Resist fire */
-        bool resist_cold;       /* Resist cold */
-        bool resist_pois;       /* Resist poison */
-
-        bool resist_fear;       /* Resist fear */
-        bool resist_lite;       /* Resist light */
-        bool resist_dark;       /* Resist darkness */
-        bool resist_blind;      /* Resist blindness */
-        bool resist_confu;      /* Resist confusion */
-        bool resist_sound;      /* Resist sound */
-        bool resist_shard;      /* Resist shards */
-        bool resist_nexus;      /* Resist nexus */
-        bool resist_nethr;      /* Resist nether */
-        bool resist_chaos;      /* Resist chaos */
-        bool resist_disen;      /* Resist disenchant */
-
-        bool sustain_str;       /* Keep strength */
-        bool sustain_int;       /* Keep intelligence */
-        bool sustain_wis;       /* Keep wisdom */
-        bool sustain_dex;       /* Keep dexterity */
-        bool sustain_con;       /* Keep constitution */
-        bool sustain_chr;       /* Keep charisma */
-
-        bool slow_digest;       /* Slower digestion */
-        bool impair_hp;   /* Slow HP regeneration */
-        bool impair_mana; /* Slow mana regeneration */
-        bool ffall;                     /* Feather falling */
-        bool regenerate;        /* Regeneration */
-        bool telepathy;         /* Telepathy */
-        bool see_inv;           /* See invisible */
-        bool free_act;          /* Free action */
-        bool hold_life;         /* Hold life */
-        bool afraid;            /* Afraid */
-
-        bool impact;            /* Earthquake blows */
-        bool aggravate;         /* Aggravate monsters */
-        bool teleport;          /* Random teleporting */
-        bool exp_drain;         /* Experience draining */
-
-        bool bless_blade;       /* Blessed blade */
-
-        s16b dis_to_h;          /* Known bonus to hit */
-        s16b dis_to_d;          /* Known bonus to dam */
-        s16b dis_to_a;          /* Known bonus to ac */
-
-        s16b dis_ac;            /* Known base ac */
-
-        s16b to_h;                      /* Bonus to hit */
-        s16b to_d;                      /* Bonus to dam */
-        s16b to_a;                      /* Bonus to ac */
-
-        s16b ac;                        /* Base ac */
-
-        s16b see_infra;         /* Infravision range */
-
-        s16b skills[SKILL_MAX]; /* Skills */
-
-        u32b noise;                     /* Derived from stealth */
-
-        s16b num_blow;          /* Number of blows */
-        s16b num_fire;          /* Number of shots */
-
-        byte ammo_mult;         /* Ammo multiplier */
-
-        byte ammo_tval;         /* Ammo variety */
-
-        s16b pspeed;            /* Current speed */
-
-        /* Generation fields (for quick start) */
-        s32b au_birth;          /* Birth gold */
-        s16b stat_birth[A_MAX]; /* Birth "natural" stat values */
-        s16b ht_birth;          /* Birth Height */
-        s16b wt_birth;          /* Birth Weight */
-};
-
-
-/**
- * Defines a (value, name) pairing.  Variable names used are historical.