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

more debugging: apply.c

Browse Source
This commit is contained in:
keni
2011-12-29 22:16:49 +00:00
parent fde6b47810
commit 68cbca9305
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/apply.c
View File

@@ -61,7 +61,7 @@ use_camera(obj)
if(!getdir((char *)0)) return(0); if(!getdir((char *)0)) return(0);
if (obj->spe <= 0) { if (obj->spe <= 0) {
pline("%s", nothing_happens); pline1(nothing_happens);
return (1); return (1);
} }
consume_obj_charge(obj, TRUE); consume_obj_charge(obj, TRUE);
@@ -944,7 +944,7 @@ struct obj **optr;
if (!obj->cursed) if (!obj->cursed)
(void) openit(); (void) openit();
else else
pline("%s", nothing_happens); pline1(nothing_happens);
} else if (obj->cursed) { } else if (obj->cursed) {
coord mm; coord mm;
@@ -980,7 +980,7 @@ struct obj **optr;
} }
res += openit(); res += openit();
switch (res) { switch (res) {
case 0: pline("%s", nothing_happens); break; case 0: pline1(nothing_happens); break;
case 1: pline("%s opens...", Something); case 1: pline("%s opens...", Something);
learno = TRUE; break; learno = TRUE; break;
default: pline("Things open around you..."); default: pline("Things open around you...");
@@ -992,7 +992,7 @@ struct obj **optr;
amii_speaker( obj, "AeFeaeFeAefegw", AMII_OKAY_VOLUME ); amii_speaker( obj, "AeFeaeFeAefegw", AMII_OKAY_VOLUME );
#endif #endif
if (findit() != 0) learno = TRUE; if (findit() != 0) learno = TRUE;
else pline("%s", nothing_happens); else pline1(nothing_happens);
} }
} /* charged BofO */ } /* charged BofO */
@@ -1355,13 +1355,13 @@ dorub()
} else if (rn2(2)) { } else if (rn2(2)) {
You("%s smoke.", !Blind ? "see a puff of" : "smell"); You("%s smoke.", !Blind ? "see a puff of" : "smell");
} else } else
pline("%s", nothing_happens); pline1(nothing_happens);
} else if (obj->otyp == BRASS_LANTERN) { } else if (obj->otyp == BRASS_LANTERN) {
/* message from Adventure */ /* message from Adventure */
pline("Rubbing the electric lamp is not particularly rewarding."); pline("Rubbing the electric lamp is not particularly rewarding.");
pline("Anyway, nothing exciting happens."); pline("Anyway, nothing exciting happens.");
} else } else
pline("%s", nothing_happens); pline1(nothing_happens);
return 1; return 1;
} }
@@ -1696,7 +1696,7 @@ struct obj *obj;
} }
if (trouble_count == 0) { if (trouble_count == 0) {
pline("%s", nothing_happens); pline1(nothing_happens);
return; return;
} else if (trouble_count > 1) { /* shuffle */ } else if (trouble_count > 1) { /* shuffle */
int i, j, k; int i, j, k;
@@ -2390,7 +2390,7 @@ struct obj *obj;
You("wrap your bullwhip around %s on the %s.", You("wrap your bullwhip around %s on the %s.",
an(singular(otmp, xname)), surface(u.ux, u.uy)); an(singular(otmp, xname)), surface(u.ux, u.uy));
if (rnl(6) || pickup_object(otmp, 1L, TRUE) < 1) if (rnl(6) || pickup_object(otmp, 1L, TRUE) < 1)
pline("%s", msg_slipsfree); pline1(msg_slipsfree);
return 1; return 1;
} }
} }
@@ -2431,7 +2431,7 @@ struct obj *obj;
wrapped_what = strcpy(buf, mon_nam(mtmp)); wrapped_what = strcpy(buf, mon_nam(mtmp));
} else if (proficient) { } else if (proficient) {
if (attack(mtmp)) return 1; if (attack(mtmp)) return 1;
else pline("%s", msg_snap); else pline1(msg_snap);
} }
} }
if (!wrapped_what) { if (!wrapped_what) {
@@ -2453,10 +2453,10 @@ struct obj *obj;
vision_full_recalc = 1; vision_full_recalc = 1;
} }
} else { } else {
pline("%s", msg_slipsfree); pline1(msg_slipsfree);
} }
if (mtmp) wakeup(mtmp); if (mtmp) wakeup(mtmp);
} else pline("%s", msg_snap); } else pline1(msg_snap);
} else if (mtmp) { } else if (mtmp) {
if (!canspotmon(mtmp) && if (!canspotmon(mtmp) &&
@@ -2547,7 +2547,7 @@ struct obj *obj;
break; break;
} }
} else { } else {
pline("%s", msg_slipsfree); pline1(msg_slipsfree);
} }
wakeup(mtmp); wakeup(mtmp);
} else { } else {
@@ -2557,7 +2557,7 @@ struct obj *obj;
else You("flick your bullwhip towards %s.", mon_nam(mtmp)); else You("flick your bullwhip towards %s.", mon_nam(mtmp));
if (proficient) { if (proficient) {
if (attack(mtmp)) return 1; if (attack(mtmp)) return 1;
else pline("%s", msg_snap); else pline1(msg_snap);
} }
} }
@@ -2566,7 +2566,7 @@ struct obj *obj;
You("snap your whip through thin air."); You("snap your whip through thin air.");
} else { } else {
pline("%s", msg_snap); pline1(msg_snap);
} }
return 1; return 1;
@@ -2854,7 +2854,7 @@ use_grapple(obj)
} }
break; break;
} }
pline("%s", nothing_happens); pline1(nothing_happens);
return (1); return (1);
} }