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-17 11:48:58 +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

16
include/ntconf.h
View File

@@ -182,15 +182,13 @@ extern void FDECL(interject, (int));
#define USE_STDARG
/* Use the high quality random number routines. */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#define RANDOM
#ifdef RANDOM
#define Rand() random()
#else
#define Rand() rand()
#endif
#ifndef USE_ISAAC64
# define RANDOM
# ifdef RANDOM
# define Rand() random()
# else
# define Rand() rand()
# endif
#endif
#include <sys/stat.h>

14
include/os2conf.h
View File

@@ -78,14 +78,12 @@
#include <time.h>
/* the high quality random number routines */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifdef RANDOM
#define Rand() random()
#else
#define Rand() rand()
#endif
#ifndef USE_ISAAC64
# ifdef RANDOM
# define Rand() random()
# else
# define Rand() rand()
# endif
#endif
/* file creation mask */

14
include/pcconf.h
View File

@@ -237,14 +237,12 @@
#endif
/* the high quality random number routines */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifdef RANDOM
#define Rand() random()
#else
#define Rand() rand()
#endif
#ifndef USE_ISAAC64
# ifdef RANDOM
# define Rand() random()
# else
# define Rand() rand()
# endif
#endif
#ifndef TOS

14
include/unixconf.h
View File

@@ -348,15 +348,13 @@
/* Use the high quality random number routines. */
/* the high quality random number routines */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
#ifndef USE_ISAAC64
# if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
|| defined(RANDOM) || defined(__APPLE__)
#define Rand() random()
#else
#define Rand() lrand48()
#endif
# define Rand() random()
# else
# define Rand() lrand48()
# endif
#endif
#ifdef TIMED_DELAY

22
include/vmsconf.h
View File

@@ -243,21 +243,19 @@ typedef __mode_t mode_t;
#define rindex strrchr
/* Use the high quality random number routines. */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#if defined(RANDOM)
#define Rand() random()
#ifndef USE_ISAAC64
# if defined(RANDOM)
# define Rand() random()
/* VMS V7 adds these entry points to DECC$SHR; stick with the nethack-supplied
code to avoid having to deal with version-specific conditionalized builds
*/
#define random nh_random
#define srandom nh_srandom
#define initstate nh_initstate
#define setstate nh_setstate
#else
#define Rand() rand()
#endif
# define random nh_random
# define srandom nh_srandom
# define initstate nh_initstate
# define setstate nh_setstate
# else
# define Rand() rand()
# endif
#endif
#define SYS_RANDOM_SEED

14
include/wceconf.h
View File

@@ -143,14 +143,12 @@
#define USE_STDARG
/* Use the high quality random number routines. */
#ifdef USE_ISAAC64
#define Rand() rn2(RAND_MAX)
#else
#ifdef RANDOM
#define Rand() random()
#else
#define Rand() rand()
#endif
#ifndef USE_ISAAC64
# ifdef RANDOM
# define Rand() random()
# else
# define Rand() rand()
# endif
#endif
#define FCMASK 0660 /* file creation mask */

6
src/rumors.c
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);