diff --git a/Makefile b/Makefile index 386591b55f..2167b8a4fe 100644 --- a/Makefile +++ b/Makefile @@ -301,7 +301,7 @@ J_F_OFILES=\ jets/f/flip.o \ jets/f/flor.o \ jets/f/fork.o \ - jets/f/help.o \ + jets/f/hint.o \ jets/f/hike.o \ jets/f/look.o \ jets/f/loot.o diff --git a/jets/f/help.c b/jets/f/hint.c similarity index 100% rename from jets/f/help.c rename to jets/f/hint.c diff --git a/jets/f/ut_mint.c b/jets/f/ut_mint.c index 3445c7050e..5dfd3322f8 100644 --- a/jets/f/ut_mint.c +++ b/jets/f/ut_mint.c @@ -542,25 +542,13 @@ case c3__note: u3x_cell(u3t(gen), &p_gen, &q_gen); _mint_used(); { + u3_noun hit = u3nc(u3k(sut), u3k(p_gen)); u3_noun hum = _mint_in(van, sut, gol, q_gen); - u3_noun ret = u3nc(u3qf_hint(p_gen, u3h(hum)), + u3_noun ret = u3nc(u3qf_hint(hit, u3h(hum)), u3k(u3t(hum))); u3z(hum); - return ret; - } - - case c3__docs: u3x_cell(u3t(gen), &p_gen, &q_gen); - _mint_used(); - { - u3_noun hep = u3nc(c3__docs, u3k(p_gen)); - u3_noun hum = _mint_in(van, sut, gol, q_gen); - - u3_noun ret = u3nc(u3qf_hint(hep, u3h(hum)), - u3k(u3t(hum))); - - u3z(hep); - u3z(hum); + u3z(hit); return ret; } diff --git a/jets/f/ut_mull.c b/jets/f/ut_mull.c index 869f4ef702..e550c80d3e 100644 --- a/jets/f/ut_mull.c +++ b/jets/f/ut_mull.c @@ -525,9 +525,13 @@ _mull_used(); { u3_noun vat = _mull_in(van, sut, gol, dox, q_gen); - u3_noun ret = u3nc(u3qf_hint(p_gen, u3h(vat)), - u3qf_hint(p_gen, u3t(vat))); + u3_noun hit = u3nc(u3k(sut), u3k(p_gen)); + u3_noun hix = u3nc(u3k(dox), u3k(p_gen)); + u3_noun ret = u3nc(u3qf_hint(hit, u3h(vat)), + u3qf_hint(hix, u3t(vat))); + u3z(hix); + u3z(hit); u3z(vat); return ret; } diff --git a/jets/f/ut_play.c b/jets/f/ut_play.c index 5ad9171d44..71d17a5baa 100644 --- a/jets/f/ut_play.c +++ b/jets/f/ut_play.c @@ -382,8 +382,10 @@ _play_used(); { u3_noun boc = _play_x(van, sut, q_gen); - u3_noun ret = u3qf_hint(p_gen, boc); + u3_noun hit = u3nc(u3k(sut), u3k(p_gen)); + u3_noun ret = u3qf_hint(hit, boc); + u3z(hit); u3z(boc); return ret; } diff --git a/jets/tree.c b/jets/tree.c index feb1af482a..afb6055e67 100644 --- a/jets/tree.c +++ b/jets/tree.c @@ -105,7 +105,6 @@ static u3j_core _143_hex_d[] = static u3j_harm _143_pen_comb_a[] = {{".2", u3wf_comb}, {}}; static u3j_harm _143_pen_cons_a[] = {{".2", u3wf_cons}, {}}; static u3j_harm _143_pen_core_a[] = {{".2", u3wf_core}, {}}; - static u3j_harm _143_pen_hint_a[] = {{".2", u3wf_hint}, {}}; static u3j_harm _143_pen_face_a[] = {{".2", u3wf_face}, {}}; static u3j_harm _143_pen_fitz_a[] = {{".2", u3wf_fitz}, {}}; static u3j_harm _143_pen_flan_a[] = {{".2", u3wf_flan}, {}}; @@ -179,7 +178,6 @@ static u3j_core _143_pen_d[] = { "flip", _143_pen_flip_a }, { "flor", _143_pen_flor_a }, { "fork", _143_pen_fork_a }, - { "hint", _143_pen_hint_a }, { "hike", _143_pen_hike_a }, { "look", _143_pen_look_a }, { "loot", _143_pen_loot_a },