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

docrt()

Browse Source 
Replace a few more instances of calling user command doredraw()
when docrt() is meant.
This commit is contained in:
PatR
2022-08-23 00:45:30 -07:00
parent 4aeb3875e2
commit 336ecf34c3
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd.c
+6 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 cmd.c $NHDT-Date: 1658993634 2022/07/28 07:33:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.597 $ */ /* NetHack 3.7 cmd.c $NHDT-Date: 1661240704 2022/08/23 07:45:04 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.616 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2086,7 +2086,7 @@ wiz_intrinsic(void)
} }
if (n >= 1) if (n >= 1)
free((genericptr_t) pick_list); free((genericptr_t) pick_list);
doredraw(); docrt();
} else } else
pline(unavailcmd, ecname_from_fn(wiz_intrinsic)); pline(unavailcmd, ecname_from_fn(wiz_intrinsic));
return ECMD_OK; return ECMD_OK;
@@ -4795,8 +4795,10 @@ dxdy_moveok(void)
boolean boolean
redraw_cmd(char c) redraw_cmd(char c)
{ {
return (boolean) (g.Cmd.commands[(uchar)c] uchar uc = (uchar) c;
&& g.Cmd.commands[(uchar)c]->ef_funct == doredraw); const struct ext_func_tab *cmd = g.Cmd.commands[uc];
return (boolean) (cmd && cmd->ef_funct == doredraw);
} }
/* /*
src/invent.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 invent.c $NHDT-Date: 1661202200 2022/08/22 21:03:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.423 $ */ /* NetHack 3.7 invent.c $NHDT-Date: 1661240719 2022/08/23 07:45:19 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.424 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -5479,7 +5479,7 @@ sync_perminvent(void)
if (WINDOWPORT(tty)) if (WINDOWPORT(tty))
perm_invent_toggled(TRUE); /* TRUE means negated */ perm_invent_toggled(TRUE); /* TRUE means negated */
#endif #endif
(void) doredraw(); docrt();
return; return;
} }
src/save.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 save.c $NHDT-Date: 1654931286 2022/06/11 07:08:06 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.187 $ */ /* NetHack 3.7 save.c $NHDT-Date: 1661240721 2022/08/23 07:45:21 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.195 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2009. */ /*-Copyright (c) Michael Allison, 2009. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -68,7 +68,7 @@ dosave(void)
exit_nhwindows("Be seeing you..."); exit_nhwindows("Be seeing you...");
nh_terminate(EXIT_SUCCESS); nh_terminate(EXIT_SUCCESS);
} else } else
(void) doredraw(); docrt();
} }
return ECMD_OK; return ECMD_OK;
} }