diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-06-08 05:01:44 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-06-08 06:18:08 +0200 |
| commit | 84f856b1ff1bdfad5114831fbea3fa87addc5377 (patch) | |
| tree | a5fd6c1a00cabc4ae15f7868ff321c1534de150b | |
| parent | a11ad32d1903074f289bfea570b75ce6c6b7b7e7 (diff) | |
Lua: Rework C-side "help activated" flags for load/save
| -rw-r--r-- | src/defines.h | 6 | ||||
| -rw-r--r-- | src/loadsave.c | 6 | ||||
| -rw-r--r-- | src/types.h | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/defines.h b/src/defines.h index 306ace92..44537732 100644 --- a/src/defines.h +++ b/src/defines.h @@ -4538,11 +4538,7 @@ /* * In game help */ -#define HELP1_BETWEEN 0x00000001 -#define HELP1_ALTAR 0x00000002 -#define HELP1_FOUNTAIN 0x00000004 -#define HELP1_IDENTIFY 0x00000008 -#define HELP1_WILD_MODE 0x00000010 +#define HELP_MAX 64 /* * Special weapon effects diff --git a/src/loadsave.c b/src/loadsave.c index 718f5858..349db36d 100644 --- a/src/loadsave.c +++ b/src/loadsave.c @@ -7,6 +7,7 @@ #include "angband.h" static void do_byte(byte *, int); +static void do_bool(bool_ *, int); static void do_u16b(u16b *, int); static void do_s16b(s16b *, int); static void do_u32b(u32b *, int); @@ -482,7 +483,10 @@ static bool_ do_extra(int flag) p_ptr->max_plv = p_ptr->lev; do_byte((byte*)&(p_ptr->help.enabled), flag); - do_u32b(&(p_ptr->help.help1), flag); + for (i = 0; i < HELP_MAX; i++) + { + do_bool(&(p_ptr->help.activated[i]), flag); + } /* More info */ tmp16s = 0; diff --git a/src/types.h b/src/types.h index 031903c0..a7d94037 100644 --- a/src/types.h +++ b/src/types.h @@ -1415,9 +1415,8 @@ struct meta_class_type typedef struct help_info help_info; struct help_info { - bool_ enabled; /* ingame help enabled */ - - u32b help1; /* help flags 1 */ + bool_ enabled; /* ingame help enabled */ + bool_ activated[HELP_MAX]; /* help item #i activated? */ }; |