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

context to g.context

Browse Source
This commit is contained in:
Bart House
2018-12-25 07:29:38 -08:00
parent 9069615861
commit 1c65e6afe0
70 changed files with 837 additions and 844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dothrow.c
View File

@@ -49,8 +49,8 @@ int shotlimit;
* been split from there (possibly triggering a panic in addinv),
* and freeinv+addinv potentially has other side-effects.
*/
if (obj->o_id == context.objsplit.parent_oid
|| obj->o_id == context.objsplit.child_oid)
if (obj->o_id == g.context.objsplit.parent_oid
|| obj->o_id == g.context.objsplit.child_oid)
(void) unsplitobj(obj);
return 0; /* no time passes */
}
@@ -404,7 +404,7 @@ endmultishot(verbose)
boolean verbose;
{
if (g.m_shot.i < g.m_shot.n) {
if (verbose && !context.mon_moving) {
if (verbose && !g.context.mon_moving) {
You("stop %s after the %d%s %s.",
g.m_shot.s ? "firing" : "throwing", g.m_shot.i, ordin(g.m_shot.i),
g.m_shot.s ? "shot" : "toss");