some symbol tweaks
A few symbol-related modifications: - fulfill a request from a blind player to allow them to specify a unique/recognizable character for all pets and/or the player in the config file for use when using a screen reader (S_player_override, S_pet_override). Requires sysconf setting ACCESSIBILITY to be set to have an effect, although they can still be specified in the config file. - Config file SYMBOLS entries were not working properly on the rogue level. Allow ROGUESYMBOLS as well as SYMBOLS to be specified in the config file independently. - When values are moved into showsyms[], the overriding SYMBOLS or ROGUESYMBOLS entry from the config file is used if there is one; if there is no overriding value for a particular symbol, the loaded symset value is used; if there is no symset entry loaded for the symbol then a default symbol is used.
This commit is contained in:
@@ -600,13 +600,13 @@ int class; /* an object class, 0 for all */
|
||||
}
|
||||
|
||||
/* Special boulder symbol check - does the class symbol happen
|
||||
* to match iflags.bouldersym which is a user-defined?
|
||||
* to match showsyms[SYM_BOULDER + SYM_OFF_X] which is user-defined.
|
||||
* If so, that means we aren't sure what they really wanted to
|
||||
* detect. Rather than trump anything, show both possibilities.
|
||||
* We can exclude checking the buried obj chain for boulders below.
|
||||
*/
|
||||
sym = class ? def_oc_syms[class].sym : 0;
|
||||
if (sym && iflags.bouldersym && sym == iflags.bouldersym)
|
||||
if (sym && showsyms[SYM_BOULDER + SYM_OFF_X] && sym == showsyms[SYM_BOULDER + SYM_OFF_X])
|
||||
boulder = ROCK_CLASS;
|
||||
|
||||
if (Hallucination || (Confusion && class == SCROLL_CLASS))
|
||||
@@ -1208,7 +1208,8 @@ struct obj **optr;
|
||||
ret = object_detect((struct obj *) 0, class);
|
||||
else if ((class = def_char_to_monclass(ch)) != MAXMCLASSES)
|
||||
ret = monster_detect((struct obj *) 0, class);
|
||||
else if (iflags.bouldersym && (ch == iflags.bouldersym))
|
||||
else if (showsyms[SYM_BOULDER + SYM_OFF_X]
|
||||
&& (ch == showsyms[SYM_BOULDER + SYM_OFF_X]))
|
||||
ret = object_detect((struct obj *) 0, ROCK_CLASS);
|
||||
else
|
||||
switch (ch) {
|
||||
|
||||
Reference in New Issue
Block a user