nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

unused variable: g.restoring

Browse Source 
Get rid of the last reference to 'g.restoring' (which managed to
unintentionally survive the change to 'g.program_state.restoring').

Also have suppress_map_output() check 'g.program_state.saving' and
switch the couple of checks against that flag to use the function.
This commit is contained in:
PatR
2021-10-05 01:57:27 -07:00
parent ccfddd47de
commit 01cb9d312f
6 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/botl.c
View File

@@ -249,8 +249,8 @@ bot(void)
{
/* dosave() flags completion by setting u.uhp to -1; supprss_map_output()
covers program_state.restoring and is used for status as well as map */
if (u.uhp != -1 && g.youmonst.data && iflags.status_updates
&& !g.program_state.saving && !suppress_map_output()) {
if (u.uhp != -1 && g.youmonst.data
&& iflags.status_updates && !suppress_map_output()) {
if (VIA_WINDOWPORT()) {
bot_via_windowport();
} else {
@@ -273,8 +273,7 @@ timebot(void)
to skip update; suppress_map_output() handles program_state.restoring
and program_state.done_hup (tty hangup => no further output at all)
and we use it for maybe skipping status as well as for the map */
if (flags.time && iflags.status_updates
&& !g.program_state.saving && !suppress_map_output()) {
if (flags.time && iflags.status_updates && !suppress_map_output()) {
if (VIA_WINDOWPORT()) {
stat_update_time();
} else {