Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
This commit is contained in:
@@ -312,6 +312,11 @@ fix foxen pluralization again after underflow remedy reintroduced the problem
|
|||||||
fix "placing monster over another?" warning for vault guards
|
fix "placing monster over another?" warning for vault guards
|
||||||
status highlighting classifies gold, time, and experience-points as data type
|
status highlighting classifies gold, time, and experience-points as data type
|
||||||
'long' but when selecting hilite rule to use treated them as 'int'
|
'long' but when selecting hilite rule to use treated them as 'int'
|
||||||
|
a config file line with OPTIONS=symset:default, roguesymset:RogueEpyx
|
||||||
|
was disabling color on RogueEpyx even though the symset is
|
||||||
|
meant to have color; that was due to an errant init_symbols() call
|
||||||
|
during the processing of symset:default done after RogueEpyx had
|
||||||
|
already been processed
|
||||||
tty: turn off an optimization that is the suspected cause of Windows reported
|
tty: turn off an optimization that is the suspected cause of Windows reported
|
||||||
partial status lines following level changes
|
partial status lines following level changes
|
||||||
tty: ensure that current status fields are always copied to prior status
|
tty: ensure that current status fields are always copied to prior status
|
||||||
|
|||||||
@@ -503,8 +503,10 @@ int nondefault;
|
|||||||
if (SYMHANDLING(H_CURS) && cursesgraphics_mode_callback)
|
if (SYMHANDLING(H_CURS) && cursesgraphics_mode_callback)
|
||||||
(*cursesgraphics_mode_callback)();
|
(*cursesgraphics_mode_callback)();
|
||||||
# endif
|
# endif
|
||||||
} else
|
} else {
|
||||||
init_symbols();
|
init_l_symbols();
|
||||||
|
init_showsyms();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
@@ -761,6 +761,7 @@ initoptions_init()
|
|||||||
for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++)
|
for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++)
|
||||||
flags.end_disclose[i] = DISCLOSE_PROMPT_DEFAULT_NO;
|
flags.end_disclose[i] = DISCLOSE_PROMPT_DEFAULT_NO;
|
||||||
switch_symbols(FALSE); /* set default characters */
|
switch_symbols(FALSE); /* set default characters */
|
||||||
|
init_r_symbols();
|
||||||
#if defined(UNIX) && defined(TTY_GRAPHICS)
|
#if defined(UNIX) && defined(TTY_GRAPHICS)
|
||||||
/*
|
/*
|
||||||
* Set defaults for some options depending on what we can
|
* Set defaults for some options depending on what we can
|
||||||
|
|||||||
Reference in New Issue
Block a user