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

another pile on the trunk

Browse Source
This commit is contained in:
keni
2012-01-04 18:14:41 +00:00
parent e3856eead3
commit f95549512a
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/questpgr.c
View File

@@ -424,7 +424,7 @@ struct qtmsg *qt_msg;
for (size = 0; size < qt_msg->size; size += (long)strlen(in_line)) {
(void) dlb_fgets(in_line, QTEXT_IN_SIZ, msg_file);
convert_line();
pline("%s", out_line);
pline1(out_line);
}
}
@@ -547,7 +547,7 @@ deliver_splev_message()
it reads from in_line[] and writes to out_line[] */
(void)xcrypt(in_line, in_line);
convert_line();
pline("%s", out_line);
pline1(out_line);
if ((nl = index(str, '\n')) == 0) break; /* done if no newline */
}

16
src/read.c
View File

@@ -202,7 +202,7 @@ stripspe(obj)
register struct obj *obj;
{
if (obj->blessed || obj->spe <= 0) {
pline(nothing_happens);
pline1(nothing_happens);
} else {
/* order matters: message, shop handling, actual transformation */
pline("%s briefly.", Yobjnam2(obj, "vibrate"));
@@ -372,7 +372,7 @@ int curse_bless;
if (obj->spe < 3)
Your("marker seems permanently dried out.");
else
pline(nothing_happens);
pline1(nothing_happens);
} else if (is_blessed) {
n = rn1(16,15); /* 15..30 */
if (obj->spe + n <= 50)
@@ -430,7 +430,7 @@ int curse_bless;
if (obj->spe < 5) {
obj->spe++;
p_glow1(obj);
} else pline(nothing_happens);
} else pline1(nothing_happens);
}
break;
case HORN_OF_PLENTY:
@@ -1462,7 +1462,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
cc.x = u.ux;
cc.y = u.uy;
if (getpos(&cc, TRUE, "the desired position") < 0) {
pline(Never_mind);
pline1(Never_mind);
break;
}
if (!cansee(cc.x, cc.y) || distu(cc.x, cc.y) >= 32) {
@@ -1672,7 +1672,7 @@ do_class_genocide()
for(j=0; ; j++) {
if (j >= 5) {
pline(thats_enough_tries);
pline1(thats_enough_tries);
return;
}
do {
@@ -1826,7 +1826,7 @@ int how;
} else {
for(i = 0; ; i++) {
if(i >= 5) {
pline(thats_enough_tries);
pline1(thats_enough_tries);
return;
}
getlin("What monster do you want to genocide? [type the name]",
@@ -1948,7 +1948,7 @@ int how;
if (cnt)
pline("Sent in some %s.", makeplural(buf));
else
pline(nothing_happens);
pline1(nothing_happens);
}
}
@@ -2095,7 +2095,7 @@ create_particular()
} while (--tryct > 0);
if (!tryct) {
pline(thats_enough_tries);
pline1(thats_enough_tries);
} else {
if (!randmonst) {
firstchoice = which;

4
src/region.c
View File

@@ -452,7 +452,7 @@ xchar
!regions[i]->attach_2_u && !inside_region(regions[i], x, y)) {
clear_hero_inside(regions[i]);
if (regions[i]->leave_msg != (const char *)0)
pline(regions[i]->leave_msg);
pline1(regions[i]->leave_msg);
if ((f_indx = regions[i]->leave_f) != NO_CALLBACK)
(void) (*callbacks[f_indx])(regions[i], (genericptr_t) 0);
}
@@ -463,7 +463,7 @@ xchar
!regions[i]->attach_2_u && inside_region(regions[i], x, y)) {
set_hero_inside(regions[i]);
if (regions[i]->enter_msg != (const char *)0)
pline(regions[i]->enter_msg);
pline1(regions[i]->enter_msg);
if ((f_indx = regions[i]->enter_f) != NO_CALLBACK)
(void) (*callbacks[f_indx])(regions[i], (genericptr_t) 0);
}

2
src/restore.c
View File

@@ -993,7 +993,7 @@ boolean ghostly;
else
Sprintf(trickbuf, "This is level %d, not %d!", dlvl, lev);
#ifdef WIZARD
if (wizard) pline(trickbuf);
if (wizard) pline1(trickbuf);
#endif
trickery(trickbuf);
}

2
src/shk.c
View File

@@ -1325,7 +1325,7 @@ proceed:
else Strcat(sbuf,
"for gold picked up and the use of merchandise.");
} else Strcat(sbuf, "for the use of merchandise.");
pline(sbuf);
pline1(sbuf);
#ifndef GOLDOBJ
if (u.ugold + eshkp->credit < dtmp) {
#else

22
src/sounds.c
View File

@@ -48,7 +48,7 @@ dosounds()
"the splashing of a naiad.",
"a soda fountain!",
};
You_hear(fountain_msg[rn2(3)+hallu]);
You_hear1(fountain_msg[rn2(3)+hallu]);
}
#ifdef SINK
if (level.flags.nsinks && !rn2(300)) {
@@ -57,7 +57,7 @@ dosounds()
"a gurgling noise.",
"dishes being washed!",
};
You_hear(sink_msg[rn2(2)+hallu]);
You_hear1(sink_msg[rn2(2)+hallu]);
}
#endif
if (level.flags.has_court && !rn2(200)) {
@@ -76,7 +76,7 @@ dosounds()
/* finding one is enough, at least for now */
int which = rn2(3)+hallu;
if (which != 2) You_hear(throne_msg[which]);
if (which != 2) You_hear1(throne_msg[which]);
else pline(throne_msg[2], uhis());
return;
}
@@ -88,7 +88,7 @@ dosounds()
"smell marsh gas!", /* so it's a smell...*/
"hear Donald Duck!",
};
You(swamp_msg[rn2(2)+hallu]);
You1(swamp_msg[rn2(2)+hallu]);
return;
}
if (level.flags.has_vault && !rn2(200)) {
@@ -198,7 +198,7 @@ dosounds()
mon_in_room(mtmp, BARRACKS) &&
/* sleeping implies not-yet-disturbed (usually) */
(mtmp->msleeping || ++count > 5)) {
You_hear(barracks_msg[rn2(3)+hallu]);
You_hear1(barracks_msg[rn2(3)+hallu]);
return;
}
}
@@ -213,7 +213,7 @@ dosounds()
if (DEADMONSTER(mtmp)) continue;
if ((mtmp->msleeping || is_animal(mtmp->data)) &&
mon_in_room(mtmp, ZOO)) {
You_hear(zoo_msg[rn2(2)+hallu]);
You_hear1(zoo_msg[rn2(2)+hallu]);
return;
}
}
@@ -231,7 +231,7 @@ dosounds()
"the chime of a cash register.",
"Neiman and Marcus arguing!",
};
You_hear(shop_msg[rn2(2)+hallu]);
You_hear1(shop_msg[rn2(2)+hallu]);
}
return;
}
@@ -277,7 +277,7 @@ dosounds()
if (index(msg, '%'))
You_hear(msg, halu_gname(EPRI(mtmp)->shralign));
else
You_hear(msg);
You_hear1(msg);
return;
}
}
@@ -297,7 +297,7 @@ dosounds()
"someone say \"No more woodchucks!\"",
"a loud ZOT!" /* both rec.humor.oracle */
};
You_hear(ora_msg[rn2(3)+hallu*2]);
You_hear1(ora_msg[rn2(3)+hallu*2]);
}
return;
}
@@ -913,8 +913,8 @@ register struct monst *mtmp;
}
if (pline_msg) pline("%s %s", Monnam(mtmp), pline_msg);
else if (mtmp->mcan && verbl_msg_mcan) verbalize(verbl_msg_mcan);
else if (verbl_msg) verbalize(verbl_msg);
else if (mtmp->mcan && verbl_msg_mcan) verbalize1(verbl_msg_mcan);
else if (verbl_msg) verbalize1(verbl_msg);
return(1);
}