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

Reformat all C files.

Browse Source 
I'll push a formatting guide at some point. There may still be
outstanding changes, but please feel free to resolve those as you arrive
a them.

To the best of my knowledge, there is no changes to the actual code
content, but the formatter does have the occasional bug. If you run into
an issue, please fix it!
This commit is contained in:
Sean Hunt
2015-05-09 13:43:16 -04:00
parent 167800afdf
commit 97d6fade74
270 changed files with 182649 additions and 173878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/were.c
+132 -114
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 were.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.6 were.c $NHDT-Date: 1431192757 2015/05/09 17:32:37 $ $NHDT-Branch: master $:$NHDT-Revision: 1.17 $ */
/* NetHack 3.6 were.c $Date: 2011/02/28 11:29:27 $ $Revision: 1.14 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -9,44 +9,57 @@ void
were_change(mon)
register struct monst *mon;
{
if (!is_were(mon->data))
return;
if (!is_were(mon->data))
return;
if (is_human(mon->data)) {
if (!Protection_from_shape_changers &&
!rn2(night() ? (flags.moonphase == FULL_MOON ? 3 : 30)
: (flags.moonphase == FULL_MOON ? 10 : 50))) {
new_were(mon); /* change into animal form */
if (!Deaf && !canseemon(mon)) {
const char *howler;
if (is_human(mon->data)) {
if (!Protection_from_shape_changers
&& !rn2(night() ? (flags.moonphase == FULL_MOON ? 3 : 30)
: (flags.moonphase == FULL_MOON ? 10 : 50))) {
new_were(mon); /* change into animal form */
if (!Deaf && !canseemon(mon)) {
const char *howler;
switch (monsndx(mon->data)) {
case PM_WEREWOLF: howler = "wolf"; break;
case PM_WEREJACKAL: howler = "jackal"; break;
default: howler = (char *)0; break;
}
if (howler)
You_hear("a %s howling at the moon.", howler);
}
}
} else if (!rn2(30) || Protection_from_shape_changers) {
new_were(mon); /* change back into human form */
}
switch (monsndx(mon->data)) {
case PM_WEREWOLF:
howler = "wolf";
break;
case PM_WEREJACKAL:
howler = "jackal";
break;
default:
howler = (char *) 0;
break;
}
if (howler)
You_hear("a %s howling at the moon.", howler);
}
}
} else if (!rn2(30) || Protection_from_shape_changers) {
new_were(mon); /* change back into human form */
}
}
int
counter_were(pm)
int pm;
{
switch(pm) {
case PM_WEREWOLF: return(PM_HUMAN_WEREWOLF);
case PM_HUMAN_WEREWOLF: return(PM_WEREWOLF);
case PM_WEREJACKAL: return(PM_HUMAN_WEREJACKAL);
case PM_HUMAN_WEREJACKAL: return(PM_WEREJACKAL);
case PM_WERERAT: return(PM_HUMAN_WERERAT);
case PM_HUMAN_WERERAT: return(PM_WERERAT);
default: return NON_PM;
}
switch (pm) {
case PM_WEREWOLF:
return (PM_HUMAN_WEREWOLF);
case PM_HUMAN_WEREWOLF:
return (PM_WEREWOLF);
case PM_WEREJACKAL:
return (PM_HUMAN_WEREJACKAL);
case PM_HUMAN_WEREJACKAL:
return (PM_WEREJACKAL);
case PM_WERERAT:
return (PM_HUMAN_WERERAT);
case PM_HUMAN_WERERAT:
return (PM_WERERAT);
default:
return NON_PM;
}
}
/* convert monsters similar to werecritters into appropriate werebeast */
@@ -59,19 +72,19 @@ int pm;
case PM_SEWER_RAT:
case PM_GIANT_RAT:
case PM_RABID_RAT:
return PM_WERERAT;
return PM_WERERAT;
case PM_WEREJACKAL:
case PM_JACKAL:
case PM_FOX:
case PM_COYOTE:
return PM_WEREJACKAL;
return PM_WEREJACKAL;
case PM_WEREWOLF:
case PM_WOLF:
case PM_WARG:
case PM_WINTER_WOLF:
return PM_WEREWOLF;
return PM_WEREWOLF;
default:
break;
break;
}
return NON_PM;
}
@@ -80,108 +93,113 @@ void
new_were(mon)
register struct monst *mon;
{
register int pm;
register int pm;
pm = counter_were(monsndx(mon->data));
if (pm < LOW_PM) {
impossible("unknown lycanthrope %s.", mon->data->mname);
return;
}
pm = counter_were(monsndx(mon->data));
if (pm < LOW_PM) {
impossible("unknown lycanthrope %s.", mon->data->mname);
return;
}
if(canseemon(mon) && !Hallucination)
pline("%s changes into a %s.", Monnam(mon),
is_human(&mons[pm]) ? "human" :
mons[pm].mname+4);
if (canseemon(mon) && !Hallucination)
pline("%s changes into a %s.", Monnam(mon),
is_human(&mons[pm]) ? "human" : mons[pm].mname + 4);
set_mon_data(mon, &mons[pm], 0);
if (mon->msleeping || !mon->mcanmove) {
/* transformation wakens and/or revitalizes */
mon->msleeping = 0;
mon->mfrozen = 0; /* not asleep or paralyzed */
mon->mcanmove = 1;
}
/* regenerate by 1/4 of the lost hit points */
mon->mhp += (mon->mhpmax - mon->mhp) / 4;
newsym(mon->mx,mon->my);
mon_break_armor(mon, FALSE);
possibly_unwield(mon, FALSE);
set_mon_data(mon, &mons[pm], 0);
if (mon->msleeping || !mon->mcanmove) {
/* transformation wakens and/or revitalizes */
mon->msleeping = 0;
mon->mfrozen = 0; /* not asleep or paralyzed */
mon->mcanmove = 1;
}
/* regenerate by 1/4 of the lost hit points */
mon->mhp += (mon->mhpmax - mon->mhp) / 4;
newsym(mon->mx, mon->my);
mon_break_armor(mon, FALSE);
possibly_unwield(mon, FALSE);
}
int
were_summon(ptr,yours,visible,genbuf) /* were-creature (even you) summons a horde */
int were_summon(ptr, yours, visible,
genbuf) /* were-creature (even you) summons a horde */
register struct permonst *ptr;
register boolean yours;
int *visible; /* number of visible helpers created */
int *visible; /* number of visible helpers created */
char *genbuf;
{
register int i, typ, pm = monsndx(ptr);
register struct monst *mtmp;
int total = 0;
register int i, typ, pm = monsndx(ptr);
register struct monst *mtmp;
int total = 0;
*visible = 0;
if(Protection_from_shape_changers && !yours)
return 0;
for(i = rnd(5); i > 0; i--) {
switch(pm) {
case PM_WERERAT:
case PM_HUMAN_WERERAT:
typ = rn2(3) ? PM_SEWER_RAT : rn2(3) ? PM_GIANT_RAT : PM_RABID_RAT ;
if (genbuf) Strcpy(genbuf, "rat");
break;
case PM_WEREJACKAL:
case PM_HUMAN_WEREJACKAL:
typ = PM_JACKAL;
if (genbuf) Strcpy(genbuf, "jackal");
break;
case PM_WEREWOLF:
case PM_HUMAN_WEREWOLF:
typ = rn2(5) ? PM_WOLF : PM_WINTER_WOLF ;
if (genbuf) Strcpy(genbuf, "wolf");
break;
default:
continue;
}
mtmp = makemon(&mons[typ], u.ux, u.uy, NO_MM_FLAGS);
if (mtmp) {
total++;
if (canseemon(mtmp)) *visible += 1;
}
if (yours && mtmp)
(void) tamedog(mtmp, (struct obj *) 0);
}
return total;
*visible = 0;
if (Protection_from_shape_changers && !yours)
return 0;
for (i = rnd(5); i > 0; i--) {
switch (pm) {
case PM_WERERAT:
case PM_HUMAN_WERERAT:
typ =
rn2(3) ? PM_SEWER_RAT : rn2(3) ? PM_GIANT_RAT : PM_RABID_RAT;
if (genbuf)
Strcpy(genbuf, "rat");
break;
case PM_WEREJACKAL:
case PM_HUMAN_WEREJACKAL:
typ = PM_JACKAL;
if (genbuf)
Strcpy(genbuf, "jackal");
break;
case PM_WEREWOLF:
case PM_HUMAN_WEREWOLF:
typ = rn2(5) ? PM_WOLF : PM_WINTER_WOLF;
if (genbuf)
Strcpy(genbuf, "wolf");
break;
default:
continue;
}
mtmp = makemon(&mons[typ], u.ux, u.uy, NO_MM_FLAGS);
if (mtmp) {
total++;
if (canseemon(mtmp))
*visible += 1;
}
if (yours && mtmp)
(void) tamedog(mtmp, (struct obj *) 0);
}
return total;
}
void
you_were()
{
char qbuf[QBUFSZ];
boolean controllable_poly = Polymorph_control && !(Stunned || Unaware);
char qbuf[QBUFSZ];
boolean controllable_poly = Polymorph_control && !(Stunned || Unaware);
if (Unchanging || (u.umonnum == u.ulycn)) return;
if (controllable_poly) {
/* `+4' => skip "were" prefix to get name of beast */
Sprintf(qbuf, "Do you want to change into %s?",
an(mons[u.ulycn].mname+4));
if(yn(qbuf) == 'n') return;
}
(void) polymon(u.ulycn);
if (Unchanging || (u.umonnum == u.ulycn))
return;
if (controllable_poly) {
/* `+4' => skip "were" prefix to get name of beast */
Sprintf(qbuf, "Do you want to change into %s?",
an(mons[u.ulycn].mname + 4));
if (yn(qbuf) == 'n')
return;
}
(void) polymon(u.ulycn);
}
void
you_unwere(purify)
boolean purify;
{
boolean controllable_poly = Polymorph_control && !(Stunned || Unaware);
boolean controllable_poly = Polymorph_control && !(Stunned || Unaware);
if (purify) {
You_feel("purified.");
u.ulycn = NON_PM; /* cure lycanthropy */
}
if (!Unchanging && is_were(youmonst.data) &&
(!controllable_poly || yn("Remain in beast form?") == 'n'))
rehumanize();
if (purify) {
You_feel("purified.");
u.ulycn = NON_PM; /* cure lycanthropy */
}
if (!Unchanging && is_were(youmonst.data)
&& (!controllable_poly || yn("Remain in beast form?") == 'n'))
rehumanize();
}
/*were.c*/