more buglist crystal ball detection
<Someone> wrote: - If I set the 'boulder' option, shouldn't I be able to give the symbol I define for them at the crystal ball "object or monster symbol" prompt and have it work? - Could ']' be added as a synonym for 'm', as with genocide? - set boulder symbol to '3'; use '/' or ';' to examine a boulder. Result is "unknown creature causing you disquiet co-located with a boulder" even though there's no warning glyph '3' there.
This commit is contained in:
@@ -1448,6 +1448,7 @@ goodfruit:
|
||||
/* boulder:symbol */
|
||||
fullname = "boulder";
|
||||
if (match_optname(opts, fullname, 7, TRUE)) {
|
||||
int clash = 0;
|
||||
if (negated) {
|
||||
bad_negation(fullname, FALSE);
|
||||
return;
|
||||
@@ -1456,11 +1457,22 @@ goodfruit:
|
||||
if (!(opts = string_for_opt(opts, FALSE)))
|
||||
return;
|
||||
escapes(opts, opts);
|
||||
|
||||
/*
|
||||
* Override the default boulder symbol.
|
||||
*/
|
||||
iflags.bouldersym = (uchar) opts[0];
|
||||
if (def_char_to_monclass(opts[0]) != MAXMCLASSES)
|
||||
clash = 1;
|
||||
else if (opts[0] >= '1' && opts[0] <= '5')
|
||||
clash = 2;
|
||||
if (clash) {
|
||||
/* symbol chosen matches a used monster or warning
|
||||
symbol which is not good - reject it*/
|
||||
pline(
|
||||
"Badoption - boulder symbol '%c' conflicts with a %s symbol.",
|
||||
opts[0], (clash == 1) ? "monster" : "warning");
|
||||
} else {
|
||||
/*
|
||||
* Override the default boulder symbol.
|
||||
*/
|
||||
iflags.bouldersym = (uchar) opts[0];
|
||||
}
|
||||
if (!initial) need_redraw = TRUE;
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user