back to trunk: potion.c

This commit is contained in:
keni
2012-01-04 18:05:21 +00:00
parent 01a44fead4
commit e3856eead3
+5 -5
View File
@@ -160,7 +160,7 @@ const char *msg;
#endif #endif
if ((!xtime && old) || (xtime && !old)) { if ((!xtime && old) || (xtime && !old)) {
if (msg) pline("%s", msg); if (msg) pline1(msg);
context.botl = 1; context.botl = 1;
} }
set_itimeout(&Slimed, xtime); set_itimeout(&Slimed, xtime);
@@ -182,7 +182,7 @@ const char *killername;
#endif #endif
if ((!xtime && old) || (xtime && !old)) { if ((!xtime && old) || (xtime && !old)) {
if (msg) pline("%s", msg); if (msg) pline1(msg);
/* context.botl = 1; --- Stoned is not a status line item */ /* context.botl = 1; --- Stoned is not a status line item */
} }
set_itimeout(&Stoned, xtime); set_itimeout(&Stoned, xtime);
@@ -1031,7 +1031,7 @@ register const char *txt;
You("have a %s feeling for a moment, then it passes.", You("have a %s feeling for a moment, then it passes.",
Hallucination ? "normal" : "strange"); Hallucination ? "normal" : "strange");
else else
pline(txt); pline1(txt);
if(!obj) /* e.g., crystal ball finds no traps */ if(!obj) /* e.g., crystal ball finds no traps */
return; return;
@@ -1516,7 +1516,7 @@ register struct obj *obj;
pline("It suddenly gets dark."); pline("It suddenly gets dark.");
} }
make_blinded(itimeout_incr(Blinded, rnd(5)), FALSE); make_blinded(itimeout_incr(Blinded, rnd(5)), FALSE);
if (!Blind && !Unaware) Your(vision_clears); if (!Blind && !Unaware) Your1(vision_clears);
break; break;
case POT_WATER: case POT_WATER:
if(u.umonnum == PM_GREMLIN) { if(u.umonnum == PM_GREMLIN) {
@@ -1813,7 +1813,7 @@ dodip()
obj == uball || obj == uskin || obj == uball || obj == uskin ||
obj_resists(obj->otyp == POT_POLYMORPH ? obj_resists(obj->otyp == POT_POLYMORPH ?
potion : obj, 5, 95)) { potion : obj, 5, 95)) {
pline(nothing_happens); pline1(nothing_happens);
} else { } else {
boolean was_wep = FALSE, was_swapwep = FALSE, was_quiver = FALSE; boolean was_wep = FALSE, was_swapwep = FALSE, was_quiver = FALSE;
short save_otyp = obj->otyp; short save_otyp = obj->otyp;