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

Don't define Rand() if isaac64 is used

Browse Source
This commit is contained in:
Patric Mueller
2019-01-28 10:02:09 +01:00
parent 3f609bf9ad
commit 97b8d0a50b
7 changed files with 44 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ntconf.h
+1 -3
View File
@@ -182,9 +182,7 @@ extern void FDECL(interject, (int));
#define USE_STDARG
/* Use the high quality random number routines. */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifndef USE_ISAAC64
# define RANDOM
# ifdef RANDOM
# define Rand() random()
include/os2conf.h
+1 -3
View File
@@ -78,9 +78,7 @@
#include <time.h>
/* the high quality random number routines */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifndef USE_ISAAC64
# ifdef RANDOM
# define Rand() random()
# else
include/pcconf.h
+1 -3
View File
@@ -237,9 +237,7 @@
#endif
/* the high quality random number routines */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifndef USE_ISAAC64
# ifdef RANDOM
# define Rand() random()
# else
include/unixconf.h
+1 -3
View File
@@ -348,9 +348,7 @@
/* Use the high quality random number routines. */
/* the high quality random number routines */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifndef USE_ISAAC64
# if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
|| defined(RANDOM) || defined(__APPLE__)
# define Rand() random()
include/vmsconf.h
+1 -3
View File
@@ -243,9 +243,7 @@ typedef __mode_t mode_t;
#define rindex strrchr
/* Use the high quality random number routines. */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifndef USE_ISAAC64
# if defined(RANDOM)
# define Rand() random()
/* VMS V7 adds these entry points to DECC$SHR; stick with the nethack-supplied
include/wceconf.h
+1 -3
View File
@@ -143,9 +143,7 @@
#define USE_STDARG
/* Use the high quality random number routines. */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifndef USE_ISAAC64
# ifdef RANDOM
# define Rand() random()
# else
src/rumors.c
+3 -3
View File
@@ -125,12 +125,12 @@ boolean exclude_cookie;
case 2: /*(might let a bogus input arg sneak thru)*/
case 1:
beginning = (long) true_rumor_start;
tidbit = Rand() % true_rumor_size;
tidbit = rn2(true_rumor_size);
break;
case 0: /* once here, 0 => false rather than "either"*/
case -1:
beginning = (long) false_rumor_start;
tidbit = Rand() % false_rumor_size;
tidbit = rn2(false_rumor_size);
break;
default:
impossible("strange truth value for rumor");
@@ -305,7 +305,7 @@ char *buf;
(void) dlb_fseek(fh, 0L, SEEK_END);
endtxt = dlb_ftell(fh);
sizetxt = endtxt - starttxt;
tidbit = Rand() % sizetxt;
tidbit = rn2(sizetxt);
(void) dlb_fseek(fh, starttxt + tidbit, SEEK_SET);
(void) dlb_fgets(line, sizeof line, fh);