lootabc and showrace options
Replace "feature_toggle" implementation with an easier-to-understand boolean option called "lootabc". Provide "showrace", an option to display the hero by race glyph rather than by role glyph. Document the above. Remove some obsolete Mac options.
This commit is contained in:
@@ -370,28 +370,6 @@ E char *fqn_prefix[PREFIX_COUNT];
|
||||
E char *fqn_prefix_names[PREFIX_COUNT];
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Feature toggles
|
||||
*
|
||||
* The following provide a way to offer two different
|
||||
* behaviours for a game interface feature, and allow
|
||||
* the player to toggle the alternate behaviour on.
|
||||
* The feature_name fields stored in the feature_toggles[]
|
||||
* array can be specified in an OPTIONS=feature_toggle:value1 value2
|
||||
* statement in the config file.
|
||||
*/
|
||||
|
||||
E unsigned long toggled_features;
|
||||
|
||||
E struct features_that_toggle {
|
||||
char *feature_name;
|
||||
unsigned long feature_bit;
|
||||
} feature_toggles[];
|
||||
|
||||
#define TOGGLE_INVALID 0
|
||||
#define TOGGLE_LOOT_MENU_SELECTORS 1 /* index in feature_toogle_list[] */
|
||||
#define LAST_FEATURE_TOGGLE 1
|
||||
|
||||
#undef E
|
||||
|
||||
#endif /* DECL_H */
|
||||
|
||||
@@ -314,10 +314,12 @@
|
||||
#define ridden_monnum_to_glyph(mnum) ((int) (mnum) + GLYPH_RIDDEN_OFF)
|
||||
#define petnum_to_glyph(mnum) ((int) (mnum) + GLYPH_PET_OFF)
|
||||
|
||||
/* The hero's glyph when seen as a monster. Could also be...
|
||||
* mon_to_glyph(Upolyd || Race_if(PM_HUMAN) ? u.umonnum : urace.malenum)
|
||||
/* The hero's glyph when seen as a monster.
|
||||
*/
|
||||
#define hero_glyph monnum_to_glyph(u.umonnum)
|
||||
#define hero_glyph \
|
||||
monnum_to_glyph((Upolyd || !iflags.showrace) ? u.umonnum : \
|
||||
(flags.female && urace.femalenum != NON_PM) ? urace.femalenum : \
|
||||
urace.malenum)
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@@ -1353,7 +1353,6 @@ E char *FDECL(nh_getenv, (const char *));
|
||||
E void FDECL(set_duplicate_opt_detection, (int));
|
||||
E void FDECL(set_wc_option_mod_status, (unsigned long, int));
|
||||
E void FDECL(set_option_mod_status, (char *, int));
|
||||
E boolean FDECL(feature_toggle, (int));
|
||||
|
||||
/* ### pager.c ### */
|
||||
|
||||
|
||||
@@ -252,6 +252,10 @@ struct instance_flags {
|
||||
boolean wc_large_font; /* draw in larger fonts (say, 12pt instead
|
||||
of 9pt) */
|
||||
boolean wc_eight_bit_input; /* allow eight bit input */
|
||||
|
||||
/* Items which belong in flags, but are here to allow save compatibility */
|
||||
boolean lootabc; /* use "a/b/c" rather than "o/i/b" when looting */
|
||||
boolean showrace; /* show hero glyph by race rather than by role */
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user