postcommit.pl 1.84 - first branch info test: polyself.c (on the trunk)

This commit is contained in:
keni
2012-01-03 19:11:34 +00:00
parent c7bdc50a2a
commit 01a44fead4

View File

@@ -361,7 +361,7 @@ int psflags;
if (!Polymorph_control && !forcecontrol && if (!Polymorph_control && !forcecontrol &&
!draconian && !iswere && !isvamp) { !draconian && !iswere && !isvamp) {
if (rn2(20) > ACURR(A_CON)) { if (rn2(20) > ACURR(A_CON)) {
You(shudder_for_moment); You1(shudder_for_moment);
losehp(rnd(30), "system shock", KILLED_BY_AN); losehp(rnd(30), "system shock", KILLED_BY_AN);
exercise(A_CON, FALSE); exercise(A_CON, FALSE);
return; return;
@@ -383,7 +383,7 @@ int psflags;
if (*buf == '\033') { if (*buf == '\033') {
/* user is cancelling controlled poly */ /* user is cancelling controlled poly */
if (forcecontrol) { /* wizard mode #polyself */ if (forcecontrol) { /* wizard mode #polyself */
pline(Never_mind); pline1(Never_mind);
return; return;
} }
Strcpy(buf, "*"); /* resort to random */ Strcpy(buf, "*"); /* resort to random */
@@ -437,7 +437,7 @@ int psflags;
You_cant("polymorph into %s.", pm_name); You_cant("polymorph into %s.", pm_name);
} else break; } else break;
} while (--tryct > 0); } while (--tryct > 0);
if (!tryct) pline(thats_enough_tries); if (!tryct) pline1(thats_enough_tries);
/* allow skin merging, even when polymorph is controlled */ /* allow skin merging, even when polymorph is controlled */
if (draconian && (tryct <= 0 || if (draconian && (tryct <= 0 ||
mntmp == armor_to_dragon(uarm->otyp))) mntmp == armor_to_dragon(uarm->otyp)))