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

184
src/rnd.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 rnd.c $NHDT-Date: 1426465440 2015/03/16 00:24:00 $ $NHDT-Branch: debug $:$NHDT-Revision: 1.8 $ */
/* NetHack 3.6 rnd.c $NHDT-Date: 1431192762 2015/05/09 17:32:42 $ $NHDT-Branch: master $:$NHDT-Revision: 1.14 $ */
/* NetHack 3.6 rnd.c $Date: 2009/05/06 10:47:41 $ $Revision: 1.7 $ */
/* SCCS Id: @(#)rnd.c 3.5 2004/08/27 */
/* NetHack may be freely redistributed. See license for details. */
@@ -6,126 +6,125 @@
#include "hack.h"
/* "Rand()"s definition is determined by [OS]conf.h */
#if defined(LINT) && defined(UNIX) /* rand() is long... */
#if defined(LINT) && defined(UNIX) /* rand() is long... */
extern int NDECL(rand);
#define RND(x) (rand() % x)
#define RND(x) (rand() % x)
#else /* LINT */
# if defined(UNIX) || defined(RANDOM)
#define RND(x) (int)(Rand() % (long)(x))
# else
#if defined(UNIX) || defined(RANDOM)
#define RND(x) (int)(Rand() % (long) (x))
#else
/* Good luck: the bottom order bits are cyclic. */
#define RND(x) (int)((Rand()>>3) % (x))
# endif
#define RND(x) (int)((Rand() >> 3) % (x))
#endif
#endif /* LINT */
int
rn2(x) /* 0 <= rn2(x) < x */
int rn2(x) /* 0 <= rn2(x) < x */
register int x;
{
#ifdef BETA
if (x <= 0) {
debugpline1("rn2(%d) attempted", x);
return(0);
}
x = RND(x);
return(x);
if (x <= 0) {
debugpline1("rn2(%d) attempted", x);
return (0);
}
x = RND(x);
return (x);
#else
return(RND(x));
return (RND(x));
#endif
}
int
rnl(x) /* 0 <= rnl(x) < x; sometimes subtracting Luck */
register int x; /* good luck approaches 0, bad luck approaches (x-1) */
int rnl(x) /* 0 <= rnl(x) < x; sometimes subtracting Luck */
register int x; /* good luck approaches 0, bad luck approaches (x-1) */
{
register int i, adjustment;
register int i, adjustment;
#ifdef BETA
if (x <= 0) {
debugpline1("rnl(%d) attempted", x);
return(0);
}
if (x <= 0) {
debugpline1("rnl(%d) attempted", x);
return (0);
}
#endif
adjustment = Luck;
if (x <= 15) {
/* for small ranges, use Luck/3 (rounded away from 0);
also guard against architecture-specific differences
of integer division involving negative values */
adjustment = (abs(adjustment) + 1) / 3 * sgn(adjustment);
/*
* 11..13 -> 4
* 8..10 -> 3
* 5.. 7 -> 2
* 2.. 4 -> 1
* -1,0,1 -> 0 (no adjustment)
* -4..-2 -> -1
* -7..-5 -> -2
* -10..-8 -> -3
* -13..-11-> -4
*/
}
adjustment = Luck;
if (x <= 15) {
/* for small ranges, use Luck/3 (rounded away from 0);
also guard against architecture-specific differences
of integer division involving negative values */
adjustment = (abs(adjustment) + 1) / 3 * sgn(adjustment);
/*
* 11..13 -> 4
* 8..10 -> 3
* 5.. 7 -> 2
* 2.. 4 -> 1
* -1,0,1 -> 0 (no adjustment)
* -4..-2 -> -1
* -7..-5 -> -2
* -10..-8 -> -3
* -13..-11-> -4
*/
}
i = RND(x);
if (adjustment && rn2(37 + abs(adjustment))) {
i -= adjustment;
if (i < 0) i = 0;
else if (i >= x) i = x-1;
}
return i;
i = RND(x);
if (adjustment && rn2(37 + abs(adjustment))) {
i -= adjustment;
if (i < 0)
i = 0;
else if (i >= x)
i = x - 1;
}
return i;
}
int
rnd(x) /* 1 <= rnd(x) <= x */
int rnd(x) /* 1 <= rnd(x) <= x */
register int x;
{
#ifdef BETA
if (x <= 0) {
debugpline1("rnd(%d) attempted", x);
return(1);
}
x = RND(x)+1;
return(x);
if (x <= 0) {
debugpline1("rnd(%d) attempted", x);
return (1);
}
x = RND(x) + 1;
return (x);
#else
return(RND(x)+1);
return (RND(x) + 1);
#endif
}
int
d(n,x) /* n <= d(n,x) <= (n*x) */
int d(n, x) /* n <= d(n,x) <= (n*x) */
register int n, x;
{
register int tmp = n;
register int tmp = n;
#ifdef BETA
if (x < 0 || n < 0 || (x == 0 && n != 0)) {
debugpline2("d(%d,%d) attempted", n, x);
return(1);
}
if (x < 0 || n < 0 || (x == 0 && n != 0)) {
debugpline2("d(%d,%d) attempted", n, x);
return (1);
}
#endif
while(n--) tmp += RND(x);
return(tmp); /* Alea iacta est. -- J.C. */
while (n--)
tmp += RND(x);
return (tmp); /* Alea iacta est. -- J.C. */
}
int
rne(x)
register int x;
{
register int tmp, utmp;
register int tmp, utmp;
utmp = (u.ulevel < 15) ? 5 : u.ulevel/3;
tmp = 1;
while (tmp < utmp && !rn2(x))
tmp++;
return tmp;
utmp = (u.ulevel < 15) ? 5 : u.ulevel / 3;
tmp = 1;
while (tmp < utmp && !rn2(x))
tmp++;
return tmp;
/* was:
* tmp = 1;
* while(!rn2(x)) tmp++;
* return(min(tmp,(u.ulevel < 15) ? 5 : u.ulevel/3));
* which is clearer but less efficient and stands a vanishingly
* small chance of overflowing tmp
*/
/* was:
* tmp = 1;
* while(!rn2(x)) tmp++;
* return(min(tmp,(u.ulevel < 15) ? 5 : u.ulevel/3));
* which is clearer but less efficient and stands a vanishingly
* small chance of overflowing tmp
*/
}
int
@@ -133,17 +132,22 @@ rnz(i)
int i;
{
#ifdef LINT
int x = i;
int tmp = 1000;
int x = i;
int tmp = 1000;
#else
register long x = i;
register long tmp = 1000;
register long x = i;
register long tmp = 1000;
#endif
tmp += rn2(1000);
tmp *= rne(4);
if (rn2(2)) { x *= tmp; x /= 1000; }
else { x *= 1000; x /= tmp; }
return((int)x);
tmp += rn2(1000);
tmp *= rne(4);
if (rn2(2)) {
x *= tmp;
x /= 1000;
} else {
x *= 1000;
x /= tmp;
}
return ((int) x);
}
/*rnd.c*/