-/* NetHack 3.6 do_name.c $NHDT-Date: 1519420054 2018/02/23 21:07:34 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.128 $ */
+/* NetHack 3.6 do_name.c $NHDT-Date: 1582364431 2020/02/22 09:40:31 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.174 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */
/* JNetHack Copyright */
/* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000 */
-/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2018 */
+/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2022 */
/* JNetHack may be freely redistributed. See license for details. */
#include "hack.h"
[1] "pick a %s"
[2] "use XXX to move the cursor to %s"
*/
-const char *const gloc_descr[NUM_GLOCS][4] = {
-#if 0 /*JP*/
- { "any monsters", "monster", "next monster", "monsters" },
- { "any items", "item", "next object", "objects" },
- { "any doors", "door", "next door or doorway", "doors or doorways" },
+static const char *const gloc_descr[NUM_GLOCS][4] = {
+#if 0 /*JP:T*/
+ { "any monsters", "monster", "next/previous monster", "monsters" },
+ { "any items", "item", "next/previous object", "objects" },
+ { "any doors", "door", "next/previous door or doorway", "doors or doorways" },
{ "any unexplored areas", "unexplored area", "unexplored location",
"unexplored locations" },
{ "anything interesting", "interesting thing", "anything interesting",
- "anything interesting" }
+ "anything interesting" },
+ { "any valid locations", "valid location", "valid location",
+ "valid locations" }
#else
{ "\89ö\95¨", "\89ö\95¨", "\89ö\95¨\82Ì\97×", "\89ö\95¨" },
{ "\95¨", "\95¨", "\95¨\82Ì\97×", "\95¨" },
{ "\94à", "\94à", "\94à\82â\8fo\93ü\82è\8cû\82Ì\97×", "\94à\82â\8fo\93ü\82è\8cû" },
{ "\96¢\92T\8dõ\95\94\95ª", "\96¢\92T\8dõ\95\94\95ª", "\96¢\92T\8dõ\82Ì\88Ê\92u", "\96¢\92T\8dõ\82Ì\88Ê\92u" },
- { "\8aÖ\90S\82Ì\82 \82é\82à\82Ì", "\8aÖ\90S\82Ì\82 \82é\82à\82Ì", "\8aÖ\90S\82Ì\82 \82é\82à\82Ì", "\8aÖ\90S\82Ì\82 \82é\82à\82Ì" }
+ { "\8aÖ\90S\82Ì\82 \82é\82à\82Ì", "\8aÖ\90S\82Ì\82 \82é\82à\82Ì", "\8aÖ\90S\82Ì\82 \82é\82à\82Ì", "\8aÖ\90S\82Ì\82 \82é\82à\82Ì" },
+ { "\97L\8cø\82È\88Ê\92u", "\97L\8cø\82È\88Ê\92u", "\97L\8cø\82È\88Ê\92u", "\97L\8cø\82È\88Ê\92u" },
#endif
};
-const char *const gloc_filtertxt[NUM_GFILTER] = {
-#if 0 /*JP*/
+static const char *const gloc_filtertxt[NUM_GFILTER] = {
+#if 0 /*JP:T*/
"",
" in view",
" in this area"
{
char sbuf[BUFSZ];
-#if 0 /*JP*/
- Sprintf(sbuf, "Use '%s' or '%s' to %s%s%s.",
+#if 0 /*JP:T*/
+ Sprintf(sbuf, "Use '%s'/'%s' to %s%s%s.",
k1, k2,
iflags.getloc_usemenu ? "get a menu of "
: "move the cursor to ",
boolean force;
const char *goal;
{
+#if 0 /*JP:T*/
+ static const char *const fastmovemode[2] = { "8 units at a time",
+ "skipping same glyphs" };
+#else
+ static const char *const fastmovemode[2] = { "\88ê\93x\82É8\83}\83X",
+ "\93¯\82¶\92n\8c`\82ð\94ò\82Î\82µ\82Ä" };
+#endif
char sbuf[BUFSZ];
boolean doing_what_is;
winid tmpwin = create_nhwindow(NHW_MENU);
-#if 0 /*JP*/
- const char *const fastmovemode[2] = { "8 units at a time",
- "skipping same glyphs" };
-#else
- const char *const fastmovemode[2] = { "\88ê\93x\82É8\83}\83X",
- "\93¯\82¶\92n\8c`\82ð\94ò\82Î\82µ\82Ä" };
-#endif
+#if 0 /*JP:T*/
Sprintf(sbuf,
-#if 0 /*JP*/
"Use '%c', '%c', '%c', '%c' to move the cursor to %s.", /* hjkl */
+ Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E, goal);
#else
+ Sprintf(sbuf,
"[%c%c%c%c]\82Å%s\82Ö\88Ú\93®\82Å\82«\82é\81D",
-#endif
Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E, goal);
+#endif
putstr(tmpwin, 0, sbuf);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf,
"Use 'H', 'J', 'K', 'L' to fast-move the cursor, %s.",
fastmovemode[iflags.getloc_moveskip]);
putstr(tmpwin, 0, "Or enter a background symbol (ex. '<').");
*/
putstr(tmpwin, 0, "\94w\8ci\82Ì\83V\83\93\83{\83\8b\82ð\93ü\97Í\82·\82é\82Æ\82»\82Ì\88Ê\92u\82É\88Ú\93®\82·\82é(\97á\81F'<')\81D");
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf, "Use '%s' to move the cursor on yourself.",
visctrl(Cmd.spkeys[NHKF_GETPOS_SELF]));
#else
visctrl(Cmd.spkeys[NHKF_GETPOS_INTERESTING_PREV]),
GLOC_INTERESTING);
}
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf, "Use '%s' to change fast-move mode to %s.",
visctrl(Cmd.spkeys[NHKF_GETPOS_MOVESKIP]),
fastmovemode[!iflags.getloc_moveskip]);
#endif
putstr(tmpwin, 0, sbuf);
if (!iflags.terrainmode || (iflags.terrainmode & TER_DETECT) == 0) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf, "Use '%s' to toggle menu listing for possible targets.",
visctrl(Cmd.spkeys[NHKF_GETPOS_MENU]));
#else
visctrl(Cmd.spkeys[NHKF_GETPOS_MENU]));
#endif
putstr(tmpwin, 0, sbuf);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf,
"Use '%s' to change the mode of limiting possible targets.",
visctrl(Cmd.spkeys[NHKF_GETPOS_LIMITVIEW]));
char kbuf[BUFSZ];
if (getpos_getvalid) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf, "Use '%s' or '%s' to move to valid locations.",
visctrl(Cmd.spkeys[NHKF_GETPOS_VALID_NEXT]),
visctrl(Cmd.spkeys[NHKF_GETPOS_VALID_PREV]));
#endif
putstr(tmpwin, 0, sbuf);
if (iflags.cmdassist) { /* assisting the '/' command, I suppose... */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf,
(iflags.getpos_coords == GPCOORDS_NONE)
? "(Set 'whatis_coord' option to include coordinates with '%s' text.)"
}
/* disgusting hack; the alternate selection characters work for any
getpos call, but only matter for dowhatis (and doquickwhatis) */
- doing_what_is = (goal == what_is_an_unknown_object);
+ doing_what_is = (goal == what_is_an_unknown_object);
if (doing_what_is) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(kbuf, "'%s' or '%s' or '%s' or '%s'",
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK]),
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK_Q]),
#endif
putstr(tmpwin, 0, sbuf);
if (doing_what_is) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf,
" '%s' describe current spot, show 'more info', move to another spot.",
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK_V]));
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK_V]));
#endif
putstr(tmpwin, 0, sbuf);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf,
" '%s' describe current spot,%s move to another spot;",
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK]),
flags.help ? "\92Ç\89Á\8fî\95ñ\82ª\82 \82ê\82Î\8am\94F\82µ\81C" : "");
#endif
putstr(tmpwin, 0, sbuf);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf,
" '%s' describe current spot, move to another spot;",
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK_Q]));
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK_Q]));
#endif
putstr(tmpwin, 0, sbuf);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(sbuf,
" '%s' describe current spot, stop looking at things;",
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK_O]));
}
STATIC_OVL int
-gloc_filter_floodfill_matcharea(x,y)
-int x,y;
+gloc_filter_floodfill_matcharea(x, y)
+int x, y;
{
int glyph = back_to_glyph(x, y);
{
if (iflags.getloc_filter == GFILTER_AREA) {
if (!gloc_filter_map) {
- gloc_filter_map = selection_opvar(NULL);
+ gloc_filter_map = selection_opvar((char *) 0);
}
/* special case: if we're in a doorway, try to figure out which
direction we're moving, and use that side of the doorway */
} else {
gloc_filter_floodfill(u.ux, u.uy);
}
-
-
}
}
{
if (gloc_filter_map) {
opvar_free_x(gloc_filter_map);
- gloc_filter_map = NULL;
+ gloc_filter_map = (struct opvar *) 0;
}
}
|| IS_UNEXPLORED_LOC(x - 1, y)
|| IS_UNEXPLORED_LOC(x, y + 1)
|| IS_UNEXPLORED_LOC(x, y - 1)));
+ case GLOC_VALID:
+ if (getpos_getvalid)
+ return (*getpos_getvalid)(x,y);
+ /*FALLTHRU*/
case GLOC_INTERESTING:
return gather_locs_interesting(x,y, GLOC_DOOR)
|| !(glyph_is_cmap(glyph)
|| glyph_to_cmap(glyph) == S_darkroom
|| glyph_to_cmap(glyph) == S_corr
|| glyph_to_cmap(glyph) == S_litcorr));
- case GLOC_VALID:
- return (getpos_getvalid && getpos_getvalid(x,y));
}
/*NOTREACHED*/
return FALSE;
/* explicit direction; 'one step' is implicit */
Sprintf(buf, "%s", directionname(dst));
} else {
- const char *dirnames[4][2] = {
-#if 0 /*JP*/
+ static const char *dirnames[4][2] = {
+#if 0 /*JP:T*/
{ "n", "north" },
{ "s", "south" },
{ "w", "west" },
cc.x = cx;
cc.y = cy;
- if (do_screen_description(cc, TRUE, sym, tmpbuf, &firstmatch)) {
+ if (do_screen_description(cc, TRUE, sym, tmpbuf, &firstmatch,
+ (struct permonst **) 0)) {
(void) coord_desc(cx, cy, tmpbuf, iflags.getpos_coords);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
custompline(SUPPRESS_HISTORY,
"%s%s%s%s%s", firstmatch, *tmpbuf ? " " : "", tmpbuf,
(iflags.autodescribe
- && getpos_getvalid && !getpos_getvalid(cx, cy))
+ && getpos_getvalid && !(*getpos_getvalid)(cx, cy))
? " (illegal)" : "",
(iflags.getloc_travelmode && !is_valid_travelpt(cx, cy))
? " (no travel path)" : "");
if (gcount < 2) { /* gcount always includes the hero */
free((genericptr_t) garr);
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("cannot %s %s.",
iflags.getloc_filter == GFILTER_VIEW ? "see" : "detect",
gloc_descr[gloc][0]);
*/
const char *firstmatch = "\95s\96¾";
int sym = 0;
+
any.a_int = i + 1;
tmpcc.x = garr[i].x;
tmpcc.y = garr[i].y;
- if (do_screen_description(tmpcc, TRUE, sym, tmpbuf, &firstmatch)) {
+ if (do_screen_description(tmpcc, TRUE, sym, tmpbuf,
+ &firstmatch, (struct permonst **)0)) {
(void) coord_desc(garr[i].x, garr[i].y, tmpbuf,
iflags.getpos_coords);
Sprintf(fullbuf, "%s%s%s", firstmatch,
}
}
-#if 0 /*JP*/
- Sprintf(tmpbuf, "Pick a target %s%s%s",
- gloc_descr[gloc][1],
+#if 0 /*JP:T*/
+ Sprintf(tmpbuf, "Pick %s%s%s",
+ an(gloc_descr[gloc][1]),
gloc_filtertxt[iflags.getloc_filter],
- iflags.getloc_travelmode ? " for travel" : "");
+ iflags.getloc_travelmode ? " for travel destination" : "");
#else
Sprintf(tmpbuf, "%s%s\82Å\96Ú\95W\82Æ\82·\82é%s\82ð\91I\91ð\82µ\82Ä\82\82¾\82³\82¢",
iflags.getloc_travelmode ? "\88Ú\93®\82Ì\82½\82ß\82É" : "",
const char *goal;
{
const char *cp;
- struct {
+ static struct {
int nhkf, ret;
} const pick_chars_def[] = {
{ NHKF_GETPOS_PICK, LOOK_TRADITIONAL },
{ NHKF_GETPOS_PICK_O, LOOK_ONCE },
{ NHKF_GETPOS_PICK_V, LOOK_VERBOSE }
};
- const int mMoOdDxX_def[] = {
+ static const int mMoOdDxX_def[] = {
NHKF_GETPOS_MON_NEXT,
NHKF_GETPOS_MON_PREV,
NHKF_GETPOS_OBJ_NEXT,
*/
goal = "\96Ú\93I\92n";
if (flags.verbose) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("(For instructions type a '%s')",
visctrl(Cmd.spkeys[NHKF_GETPOS_HELP]));
#else
msg_given = TRUE;
goto nxtc;
} else if (c == Cmd.spkeys[NHKF_GETPOS_LIMITVIEW]) {
- const char *const view_filters[NUM_GFILTER] = {
-#if 0 /*JP*/
+ static const char *const view_filters[NUM_GFILTER] = {
+#if 0 /*JP:T*/
"Not limiting targets",
- "Limiting targets to in sight",
- "Limiting targets to in same area"
+ "Limiting targets to those in sight",
+ "Limiting targets to those in same area"
#else
"\83^\81[\83Q\83b\83g\82ð\90§\8cÀ\82µ\82È\82¢",
"\8e\8b\8aE\93à\82É\83^\81[\83Q\83b\83g\82ð\90§\8cÀ\82·\82é",
"\93¯\82¶\83G\83\8a\83A\82É\83^\81[\83Q\83b\83g\82ð\90§\8cÀ\82·\82é"
#endif
};
+
iflags.getloc_filter = (iflags.getloc_filter + 1) % NUM_GFILTER;
for (i = 0; i < NUM_GLOCS; i++) {
if (garr[i]) {
goto nxtc;
} else if (c == Cmd.spkeys[NHKF_GETPOS_MENU]) {
iflags.getloc_usemenu = !iflags.getloc_usemenu;
-#if 0 /*JP*/
- pline("%s a menu to show possible targets.",
- iflags.getloc_usemenu ? "Using" : "Not using");
+#if 0 /*JP:T*/
+ pline("%s a menu to show possible targets%s.",
+ iflags.getloc_usemenu ? "Using" : "Not using",
+ iflags.getloc_usemenu
+ ? " for 'm|M', 'o|O', 'd|D', and 'x|X'" : "");
#else
- pline("\89Â\94\\82È\83^\81[\83Q\83b\83g\82ð\8c©\82é\82Ì\82É\83\81\83j\83\85\81[\82ð\8eg%s\81D",
- iflags.getloc_usemenu ? "\82¤" : "\82í\82È\82¢");
+ pline("\89Â\94\\82È\83^\81[\83Q\83b\83g\82ð\8c©\82é\82Ì\82É\83\81\83j\83\85\81[\82ð\8eg%s\81D%s",
+ iflags.getloc_usemenu ? "\82¤" : "\82í\82È\82¢",
+ iflags.getloc_usemenu
+ ? "('m|M', 'o|O', 'd|D', 'x|X'\97p)" : "");
#endif
msg_given = TRUE;
goto nxtc;
goto nxtc;
} else if (c == Cmd.spkeys[NHKF_GETPOS_MOVESKIP]) {
iflags.getloc_moveskip = !iflags.getloc_moveskip;
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%skipping over similar terrain when fastmoving the cursor.",
iflags.getloc_moveskip ? "S" : "Not s");
#else
if (iflags.getloc_usemenu) {
coord tmpcrd;
+
if (getpos_menu(&tmpcrd, gloc)) {
cx = tmpcrd.x;
cy = tmpcrd.y;
*/
Strcpy(note, "\92\86\92f\82µ\82½");
else /* hjkl */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(note, "use '%c', '%c', '%c', '%c' or '%s'",
Cmd.move_W, Cmd.move_S, Cmd.move_N, Cmd.move_E,
visctrl(Cmd.spkeys[NHKF_GETPOS_PICK]));
/* catch trying to name "the {priest,Angel} of Crom" as "Crom" */
|| ((p = strstri(monnambuf, " of ")) != 0
&& fuzzymatch(usrbuf, p + 4, " -_", TRUE))) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s is already called %s.",
upstart(strcpy(pronounbuf, mhe(mtmp))), monnambuf);
#else
STATIC_OVL void
do_mname()
{
- char buf[BUFSZ] = DUMMY, monnambuf[BUFSZ], qbuf[QBUFSZ];
+ char buf[BUFSZ], monnambuf[BUFSZ], qbuf[QBUFSZ];
coord cc;
int cx, cy;
struct monst *mtmp = 0;
if (getpos(&cc, FALSE, "the monster you want to name") < 0
*/
if (getpos(&cc, FALSE, "\82 \82È\82½\82ª\96¼\82Ã\82¯\82½\82¢\89ö\95¨") < 0
- || (cx = cc.x) < 0)
+ || !isok(cc.x, cc.y))
return;
- cy = cc.y;
+ cx = cc.x, cy = cc.y;
if (cx == u.ux && cy == u.uy) {
if (u.usteed && canspotmon(u.usteed)) {
if (!mtmp
|| (!sensemon(mtmp)
&& (!(cansee(cx, cy) || see_with_infrared(mtmp))
- || mtmp->mundetected || mtmp->m_ap_type == M_AP_FURNITURE
- || mtmp->m_ap_type == M_AP_OBJECT
+ || mtmp->mundetected || M_AP_TYPE(mtmp) == M_AP_FURNITURE
+ || M_AP_TYPE(mtmp) == M_AP_OBJECT
|| (mtmp->minvis && !See_invisible)))) {
/*JP
pline("I see no monster there.");
*/
Sprintf(qbuf, "%s\82ð\89½\82Æ\8cÄ\82Ñ\82Ü\82·\82©\81H",
distant_monnam(mtmp, ARTICLE_THE, monnambuf));
+ buf[0] = '\0';
+#ifdef EDIT_GETLIN
+ /* if there's an existing name, make it be the default answer */
+ if (has_mname(mtmp))
+ Strcpy(buf, MNAME(mtmp));
+#endif
getlin(qbuf, buf);
if (!*buf || *buf == '\033')
return;
*
* Don't say the name is being rejected if it happens to match
* the existing name.
+ *
+ * TODO: should have an alternate message when the attempt is to
+ * remove existing name without assigning a new one.
*/
if ((mtmp->data->geno & G_UNIQ) && !mtmp->ispriest) {
if (!alreadynamed(mtmp, monnambuf, buf))
/*JP
- pline("%s doesn't like being called names!", upstart(monnambuf));
+ pline("%s doesn't like being called names!", upstart(monnambuf));
*/
- pline("%s\82Í\82 \82¾\96¼\82Å\8cÄ\82Î\82ê\82é\82Ì\82ª\8c\99\82¢\82È\82æ\82¤\82¾\81I", Monnam(mtmp));
+ pline("%s\82Í\82 \82¾\96¼\82Å\8cÄ\82Î\82ê\82é\82Ì\82ª\8c\99\82¢\82È\82æ\82¤\82¾\81I", Monnam(mtmp));
} else if (mtmp->isshk
&& !(Deaf || mtmp->msleeping || !mtmp->mcanmove
|| mtmp->data->msound <= MS_ANIMAL)) {
if (!alreadynamed(mtmp, monnambuf, buf))
/*JP
- verbalize("I'm %s, not %s.", shkname(mtmp), buf);
+ verbalize("I'm %s, not %s.", shkname(mtmp), buf);
*/
- verbalize("\8e\84\82Í%s\82¾\81C%s\82Å\82Í\82È\82¢\81D", shkname(mtmp), buf);
+ verbalize("\8e\84\82Í%s\82¾\81C%s\82Å\82Í\82È\82¢\81D", shkname(mtmp), buf);
} else if (mtmp->ispriest || mtmp->isminion || mtmp->isshk) {
if (!alreadynamed(mtmp, monnambuf, buf))
/*JP
- pline("%s will not accept the name %s.", upstart(monnambuf), buf);
+ pline("%s will not accept the name %s.", upstart(monnambuf), buf);
*/
- pline("%s\82Í%s\82Æ\82¢\82¤\96¼\91O\82ð\8eó\82¯\82¢\82ê\82È\82©\82Á\82½\81D", monnambuf, buf);
+ pline("%s\82Í%s\82Æ\82¢\82¤\96¼\91O\82ð\8eó\82¯\82¢\82ê\82È\82©\82Á\82½\81D", monnambuf, buf);
} else
(void) christen_monst(mtmp, buf);
}
do_oname(obj)
register struct obj *obj;
{
- char *bufp, buf[BUFSZ] = DUMMY, bufcpy[BUFSZ], qbuf[QBUFSZ];
+ char *bufp, buf[BUFSZ], bufcpy[BUFSZ], qbuf[QBUFSZ];
const char *aname;
short objtyp;
-#if 1 /*JP*/
- boolean is_japanese = FALSE;
-#endif
/* Do this now because there's no point in even asking for a name */
if (obj->otyp == SPE_NOVEL) {
return;
}
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(qbuf, "What do you want to name %s ",
is_plural(obj) ? "these" : "this");
(void) safe_qbuf(qbuf, qbuf, "?", obj, xname, simpleonames, "item");
#else
- (void) safe_qbuf(qbuf, "", "\82ð\89½\82Æ\96¼\82Ã\82¯\82Ü\82·\82©\81H", obj, xname, simpleonames, "item");
+ (void) safe_qbuf(qbuf, "", "\82ð\89½\82Æ\96¼\82Ã\82¯\82Ü\82·\82©\81H", obj, xname,
+ simpleonames, "\82»\82ê");
+#endif
+ buf[0] = '\0';
+#ifdef EDIT_GETLIN
+ /* if there's an existing name, make it be the default answer */
+ if (has_oname(obj))
+ Strcpy(buf, ONAME(obj));
#endif
getlin(qbuf, buf);
if (!*buf || *buf == '\033')
/* relax restrictions over proper capitalization for artifacts */
if ((aname = artifact_name(buf, &objtyp)) != 0 && objtyp == obj->otyp)
-#if 0 /*JP*/
Strcpy(buf, aname);
-#else
- {
- is_japanese = is_kanji(*buf);
- Strcpy(buf, aname);
- }
-#endif
if (obj->oartifact) {
/*JP
/* for "the Foo of Bar", only scuff "Foo of Bar" part */
bufp = !strncmpi(bufcpy, "the ", 4) ? (buf + 4) : buf;
do {
- wipeout_text(bufp, rnd(2), (unsigned) 0);
+ wipeout_text(bufp, rn2_on_display_rng(2), (unsigned) 0);
} while (!strcmp(buf, bufcpy));
/*JP
pline("While engraving, your %s slips.", body_part(HAND));
docall(obj)
struct obj *obj;
{
- char buf[BUFSZ] = DUMMY, qbuf[QBUFSZ];
+ char buf[BUFSZ], qbuf[QBUFSZ];
char **str1;
if (!obj->dknown)
return; /* probably blind */
+ flush_screen(1); /* buffered updates might matter to player's response */
if (obj->oclass == POTION_CLASS && obj->fromsink)
/* kludge, meaning it's sink water */
Sprintf(qbuf, "%s\89t\91Ì:",
OBJ_DESCR(objects[obj->otyp]));
else
-#if 0 /*JP*/
+#if 0 /*JP:T*/
(void) safe_qbuf(qbuf, "Call ", ":", obj,
docall_xname, simpleonames, "thing");
#else
(void) safe_qbuf(qbuf, "", "\82É\89½\82Æ\96¼\91O\82ð\95t\82¯\82é\81H", obj,
docall_xname, simpleonames, "\82±\82ê");
#endif
+ /* pointer to old name */
+ str1 = &(objects[obj->otyp].oc_uname);
+ buf[0] = '\0';
+#ifdef EDIT_GETLIN
+ /* if there's an existing name, make it be the default answer */
+ if (*str1)
+ Strcpy(buf, *str1);
+#endif
getlin(qbuf, buf);
if (!*buf || *buf == '\033')
return;
/* clear old name */
- str1 = &(objects[obj->otyp].oc_uname);
if (*str1)
free((genericptr_t) *str1);
int glyph;
char buf[BUFSZ];
struct obj *obj = 0;
+#if 0 /*JP*/
boolean fakeobj = FALSE, use_plural;
+#else
+ boolean fakeobj = FALSE;
+#endif
cc.x = u.ux, cc.y = u.uy;
/* "dot for under/over you" only makes sense when the cursor hasn't
been moved off the hero's '@' yet, but there's no way to adjust
the help text once getpos() has started */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Sprintf(buf, "object on map (or '.' for one %s you)",
(u.uundetected && hides_under(youmonst.data)) ? "over" : "under");
#else
}
if (!obj) {
/* "under you" is safe here since there's no object to hide under */
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("There doesn't seem to be any object %s.",
(cc.x == u.ux && cc.y == u.uy) ? "under you" : "there");
#else
#endif
return;
}
- /* note well: 'obj' might be as instance of STRANGE_OBJECT if target
+ /* note well: 'obj' might be an instance of STRANGE_OBJECT if target
is a mimic; passing that to xname (directly or via simpleonames)
would yield "glorkum" so we need to handle it explicitly; it will
always fail the Hallucination test and pass the !callable test,
Strcpy(buf, (obj->otyp != STRANGE_OBJECT)
? simpleonames(obj)
: obj_descr[STRANGE_OBJECT].oc_name);
+#if 0 /*JP*/
use_plural = (obj->quan > 1L);
+#endif
if (Hallucination) {
const char *unames[6];
char tmpbuf[BUFSZ];
unames[0] = ((Upolyd ? u.mfemale : flags.female) && urole.name.f)
? urole.name.f
: urole.name.m;
- /* random rank title for hero's role */
- unames[1] = rank_of(rnd(30), Role_switch, flags.female);
+ /* random rank title for hero's role
+
+ note: the 30 is hardcoded in xlev_to_rank, so should be
+ hardcoded here too */
+ unames[1] = rank_of(rn2_on_display_rng(30) + 1,
+ Role_switch, flags.female);
/* random fake monster */
unames[2] = bogusmon(tmpbuf, (char *) 0);
/* increased chance for fake monster */
unames[5] = "Wibbly Wobbly";
*/
unames[5] = "\82¤\82ë\82¤\82ë";
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s %s to call you \"%s.\"",
The(buf), use_plural ? "decide" : "decides",
- unames[rn2(SIZE(unames))]);
+ unames[rn2_on_display_rng(SIZE(unames))]);
#else
pline("%s\82Í\82 \82È\82½\82ð\81u%s\81v\82Æ\8cÄ\82Ô\82±\82Æ\82É\8c\88\82ß\82½\81D",
buf,
- unames[rn2(SIZE(unames))]);
+ unames[rn2_on_display_rng(SIZE(unames))]);
#endif
} else if (!objtyp_is_callable(obj->otyp)) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
pline("%s %s can't be assigned a type name.",
use_plural ? "Those" : "That", buf);
#else
buf);
#endif
} else if (!obj->dknown) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
You("don't know %s %s well enough to name %s.",
use_plural ? "those" : "that", buf, use_plural ? "them" : "it");
#else
} else {
docall(obj);
}
- if (fakeobj)
+ if (fakeobj) {
+ obj->where = OBJ_FREE; /* object_from_map() sets it to OBJ_FLOOR */
dealloc_obj(obj);
+ }
}
static const char *const ghostnames[] = {
*/
Strcat(buf, "\88Æ\82Ì\82Â\82¢\82Ä\82¢\82é");
#if 0 /*JP*/
- if (buf[0] != 0)
- has_adjectives = TRUE;
- else
- has_adjectives = FALSE;
+ has_adjectives = (buf[0] != '\0');
#endif
- /* Put the actual monster name or type into the buffer now */
- /* Be sure to remember whether the buffer starts with a name */
+ /* Put the actual monster name or type into the buffer now.
+ Remember whether the buffer starts with a personal name. */
if (do_hallu) {
char rnamecode;
char *rname = rndmonnam(&rnamecode);
its own obfuscation) */
if (mon->data == &mons[PM_HIGH_PRIEST] && !Hallucination
&& Is_astralevel(&u.uz) && distu(mon->mx, mon->my) > 2) {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
Strcpy(outbuf, article == ARTICLE_THE ? "the " : "");
Strcat(outbuf, mon->female ? "high priestess" : "high priest");
#else
return outbuf;
}
+/* returns mon_nam(mon) relative to other_mon; normal name unless they're
+ the same, in which case the reference is to {him|her|it} self */
+char *
+mon_nam_too(mon, other_mon)
+struct monst *mon, *other_mon;
+{
+ char *outbuf;
+
+ if (mon != other_mon) {
+ outbuf = mon_nam(mon);
+ } else {
+ outbuf = nextmbuf();
+#if 0 /*JP*/
+ switch (pronoun_gender(mon, FALSE)) {
+ case 0:
+ Strcpy(outbuf, "himself");
+ break;
+ case 1:
+ Strcpy(outbuf, "herself");
+ break;
+ default:
+ Strcpy(outbuf, "itself");
+ break;
+ }
+#else
+ Strcpy(outbuf, "\8e©\95ª\8e©\90g");
+#endif
+ }
+ return outbuf;
+}
+
+/* for debugging messages, where data might be suspect and we aren't
+ taking what the hero does or doesn't know into consideration */
+char *
+minimal_monnam(mon, ckloc)
+struct monst *mon;
+boolean ckloc;
+{
+ struct permonst *ptr;
+ char *outbuf = nextmbuf();
+
+ if (!mon) {
+ Strcpy(outbuf, "[Null monster]");
+ } else if ((ptr = mon->data) == 0) {
+ Strcpy(outbuf, "[Null mon->data]");
+ } else if (ptr < &mons[0]) {
+ Sprintf(outbuf, "[Invalid mon->data %s < %s]",
+ fmt_ptr((genericptr_t) mon->data),
+ fmt_ptr((genericptr_t) &mons[0]));
+ } else if (ptr >= &mons[NUMMONS]) {
+ Sprintf(outbuf, "[Invalid mon->data %s >= %s]",
+ fmt_ptr((genericptr_t) mon->data),
+ fmt_ptr((genericptr_t) &mons[NUMMONS]));
+ } else if (ckloc && ptr == &mons[PM_LONG_WORM]
+ && level.monsters[mon->mx][mon->my] != mon) {
+ Sprintf(outbuf, "%s <%d,%d>",
+ mons[PM_LONG_WORM_TAIL].mname, mon->mx, mon->my);
+ } else {
+ Sprintf(outbuf, "%s%s <%d,%d>",
+ mon->mtame ? "tame " : mon->mpeaceful ? "peaceful " : "",
+ mon->data->mname, mon->mx, mon->my);
+ if (mon->cham != NON_PM)
+ Sprintf(eos(outbuf), "{%s}", mons[mon->cham].mname);
+ }
+ return outbuf;
+}
+
/* fake monsters used to be in a hard-coded array, now in a data file */
STATIC_OVL char *
bogusmon(buf, code)
char *buf, *code;
{
+ static const char bogon_codes[] = "-_+|="; /* see dat/bonusmon.txt */
char *mname = buf;
- get_rnd_text(BOGUSMONFILE, buf);
- /* strip prefix if present */
- if (!letter(*mname)) {
+ if (code)
+ *code = '\0';
+ /* might fail (return empty buf[]) if the file isn't available */
+ get_rnd_text(BOGUSMONFILE, buf, rn2_on_display_rng);
+ if (!*mname) {
+ Strcpy(buf, "bogon");
+ } else if (index(bogon_codes, *mname)) { /* strip prefix if present */
if (code)
*code = *mname;
++mname;
- } else {
- if (code)
- *code = '\0';
}
return mname;
}
*code = '\0';
do {
- name = rn1(SPECIAL_PM + BOGUSMONSIZE - LOW_PM, LOW_PM);
+ name = rn2_on_display_rng(SPECIAL_PM + BOGUSMONSIZE - LOW_PM) + LOW_PM;
} while (name < SPECIAL_PM
&& (type_is_pname(&mons[name]) || (mons[name].geno & G_NOGEN)));
}
static NEARDATA const char *const hcolors[] = {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
"ultraviolet", "infrared", "bluish-orange", "reddish-green", "dark white",
"light black", "sky blue-pink", "salty", "sweet", "sour", "bitter",
"striped", "spiral", "swirly", "plaid", "checkered", "argyle", "paisley",
hcolor(colorpref)
const char *colorpref;
{
- return (Hallucination || !colorpref) ? hcolors[rn2(SIZE(hcolors))]
- : colorpref;
+ return (Hallucination || !colorpref)
+ ? hcolors[rn2_on_display_rng(SIZE(hcolors))]
+ : colorpref;
}
/* return a random real color unless hallucinating */
}
static NEARDATA const char *const hliquids[] = {
-#if 0 /*JP*/
+#if 0 /*JP:T*/
"yoghurt", "oobleck", "clotted blood", "diluted water", "purified water",
"instant coffee", "tea", "herbal infusion", "liquid rainbow",
"creamy foam", "mulled wine", "bouillon", "nectar", "grog", "flubber",
"ketchup", "slow light", "oil", "vinaigrette", "liquid crystal", "honey",
- "caramel sauce", "ink", "aqueous humour", "milk substitute", "fruit juice",
- "glowing lava", "gastric acid", "mineral water", "cough syrup", "quicksilver",
- "sweet vitriol", "grey goo", "pink slime",
+ "caramel sauce", "ink", "aqueous humour", "milk substitute",
+ "fruit juice", "glowing lava", "gastric acid", "mineral water",
+ "cough syrup", "quicksilver", "sweet vitriol", "grey goo", "pink slime",
#else
"\83\88\81[\83O\83\8b\83g", "\83E\81[\83u\83\8c\83b\83N", "\8c\8c\8cÐ", "\8fö\97¯\90\85", "\90¸\90»\90\85",
"\83C\83\93\83X\83^\83\93\83g\83R\81[\83q\81[", "\8dg\92\83", "\83n\81[\83u\89t", "\89t\91Ì\82Ì\93ø",
"\83N\83\8a\81[\83~\81[\83t\83H\81[\83\80", "\83z\83b\83g\83\8f\83C\83\93", "\83u\83C\83\88\83\93", "\89Ê\8f`", "\83O\83\8d\83b\83O", "\83t\83\89\83o\81[",
"\83P\83`\83\83\83b\83v", "\92á\91¬\8cõ", "\96û", "\83r\83l\83O\83\8c\83b\83g\83\\81[\83X", "\89t\91Ì\90\85\8f»", "\96I\96¨",
- "\83J\83\89\83\81\83\8b\83\\81[\83X", "\83C\83\93\83N", "\96[\90\85", "\91ã\97p\93û", "\83t\83\8b\81[\83c\83W\83\85\81[\83X",
- "\97¬\82ê\82é\97n\8aâ", "\88Ý\8e_", "\83~\83l\83\89\83\8b\83E\83H\81[\83^\81[", "\8aP\8e~\82ß\83V\83\8d\83b\83v", "\90\85\8bâ",
- "\83W\83G\83`\83\8b\83G\81[\83e\83\8b", "\83O\83\8c\83C\83O\81[", "\83s\83\93\83N\83X\83\89\83C\83\80",
+ "\83J\83\89\83\81\83\8b\83\\81[\83X", "\83C\83\93\83N", "\96[\90\85", "\91ã\97p\93û",
+ "\83t\83\8b\81[\83c\83W\83\85\81[\83X", "\97¬\82ê\82é\97n\8aâ", "\88Ý\8e_", "\83~\83l\83\89\83\8b\83E\83H\81[\83^\81[",
+ "\8aP\8e~\82ß\83V\83\8d\83b\83v", "\90\85\8bâ", "\83W\83G\83`\83\8b\83G\81[\83e\83\8b", "\83O\83\8c\83C\83O\81[", "\83s\83\93\83N\83X\83\89\83C\83\80",
#endif
};
const char *liquidpref;
{
return (Hallucination || !liquidpref) ? hliquids[rn2(SIZE(hliquids))]
- : liquidpref;
+ : liquidpref;
}
/* Aliases for road-runner nemesis
return buf;
}
+char *
+rndorcname(s)
+char *s;
+{
+ static const char *v[] = { "a", "ai", "og", "u" };
+ static const char *snd[] = { "gor", "gris", "un", "bane", "ruk",
+ "oth","ul", "z", "thos","akh","hai" };
+ int i, iend = rn1(2, 3), vstart = rn2(2);
+
+ if (s) {
+ *s = '\0';
+ for (i = 0; i < iend; ++i) {
+ vstart = 1 - vstart; /* 0 -> 1, 1 -> 0 */
+ Sprintf(eos(s), "%s%s", (i > 0 && !rn2(30)) ? "-" : "",
+ vstart ? v[rn2(SIZE(v))] : snd[rn2(SIZE(snd))]);
+ }
+ }
+ return s;
+}
+
+struct monst *
+christen_orc(mtmp, gang, other)
+struct monst *mtmp;
+const char *gang, *other;
+{
+ int sz = 0;
+ char buf[BUFSZ], buf2[BUFSZ], *orcname;
+
+ orcname = rndorcname(buf2);
+ sz = (int) strlen(orcname);
+ if (gang)
+ sz += (int) (strlen(gang) + sizeof " of " - sizeof "");
+ else if (other)
+ sz += (int) strlen(other);
+
+ if (sz < BUFSZ) {
+ char gbuf[BUFSZ];
+ boolean nameit = FALSE;
+
+ if (gang && orcname) {
+ Sprintf(buf, "%s of %s", upstart(orcname),
+ upstart(strcpy(gbuf, gang)));
+ nameit = TRUE;
+ } else if (other && orcname) {
+ Sprintf(buf, "%s%s", upstart(orcname), other);
+ nameit = TRUE;
+ }
+ if (nameit)
+ mtmp = christen_monst(mtmp, buf);
+ }
+ return mtmp;
+}
+
/* make sure "The Colour of Magic" remains the first entry in here */
static const char *const sir_Terry_novels[] = {
"The Colour of Magic", "The Light Fantastic", "Equal Rites", "Mort",
OSDN Git Service
