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
+7 -9
View File
@@ -182,15 +182,13 @@ extern void FDECL(interject, (int));
#define USE_STDARG #define USE_STDARG
/* Use the high quality random number routines. */ /* Use the high quality random number routines. */
#ifdef USE_ISAAC64 #ifndef USE_ISAAC64
#define Rand() rn2(RAND_MAX) # define RANDOM
#else # ifdef RANDOM
#define RANDOM # define Rand() random()
#ifdef RANDOM # else
#define Rand() random() # define Rand() rand()
#else # endif
#define Rand() rand()
#endif
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
include/os2conf.h
+6 -8
View File
@@ -78,14 +78,12 @@
#include <time.h> #include <time.h>
/* the high quality random number routines */ /* the high quality random number routines */
#ifdef USE_ISAAC64 #ifndef USE_ISAAC64
#define Rand() rn2(RAND_MAX) # ifdef RANDOM
#else # define Rand() random()
#ifdef RANDOM # else
#define Rand() random() # define Rand() rand()
#else # endif
#define Rand() rand()
#endif
#endif #endif
/* file creation mask */ /* file creation mask */
include/pcconf.h
+6 -8
View File
@@ -237,14 +237,12 @@
#endif #endif
/* the high quality random number routines */ /* the high quality random number routines */
#ifdef USE_ISAAC64 #ifndef USE_ISAAC64
#define Rand() rn2(RAND_MAX) # ifdef RANDOM
#else # define Rand() random()
#ifdef RANDOM # else
#define Rand() random() # define Rand() rand()
#else # endif
#define Rand() rand()
#endif
#endif #endif
#ifndef TOS #ifndef TOS
include/unixconf.h
+6 -8
View File
@@ -348,15 +348,13 @@
/* Use the high quality random number routines. */ /* Use the high quality random number routines. */
/* the high quality random number routines */ /* the high quality random number routines */
#ifdef USE_ISAAC64 #ifndef USE_ISAAC64
#define Rand() rn2(RAND_MAX) # if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
#else
#if defined(BSD) || defined(LINUX) || defined(ULTRIX) || defined(CYGWIN32) \
|| defined(RANDOM) || defined(__APPLE__) || defined(RANDOM) || defined(__APPLE__)
#define Rand() random() # define Rand() random()
#else # else
#define Rand() lrand48() # define Rand() lrand48()
#endif # endif
#endif #endif
#ifdef TIMED_DELAY #ifdef TIMED_DELAY
include/vmsconf.h
+10 -12
View File
@@ -243,21 +243,19 @@ typedef __mode_t mode_t;
#define rindex strrchr #define rindex strrchr
/* Use the high quality random number routines. */ /* Use the high quality random number routines. */
#ifdef USE_ISAAC64 #ifndef USE_ISAAC64
#define Rand() rn2(RAND_MAX) # if defined(RANDOM)
#else # define Rand() random()
#if defined(RANDOM)
#define Rand() random()
/* VMS V7 adds these entry points to DECC$SHR; stick with the nethack-supplied /* 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 code to avoid having to deal with version-specific conditionalized builds
*/ */
#define random nh_random # define random nh_random
#define srandom nh_srandom # define srandom nh_srandom
#define initstate nh_initstate # define initstate nh_initstate
#define setstate nh_setstate # define setstate nh_setstate
#else # else
#define Rand() rand() # define Rand() rand()
#endif # endif
#endif #endif
#define SYS_RANDOM_SEED #define SYS_RANDOM_SEED
include/wceconf.h
+6 -8
View File
@@ -143,14 +143,12 @@
#define USE_STDARG #define USE_STDARG
/* Use the high quality random number routines. */ /* Use the high quality random number routines. */
#ifdef USE_ISAAC64 #ifndef USE_ISAAC64
#define Rand() rn2(RAND_MAX) # ifdef RANDOM
#else # define Rand() random()
#ifdef RANDOM # else
#define Rand() random() # define Rand() rand()
#else # endif
#define Rand() rand()
#endif
#endif #endif
#define FCMASK 0660 /* file creation mask */ #define FCMASK 0660 /* file creation mask */
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 2: /*(might let a bogus input arg sneak thru)*/
case 1: case 1:
beginning = (long) true_rumor_start; beginning = (long) true_rumor_start;
tidbit = Rand() % true_rumor_size; tidbit = rn2(true_rumor_size);
break; break;
case 0: /* once here, 0 => false rather than "either"*/ case 0: /* once here, 0 => false rather than "either"*/
case -1: case -1:
beginning = (long) false_rumor_start; beginning = (long) false_rumor_start;
tidbit = Rand() % false_rumor_size; tidbit = rn2(false_rumor_size);
break; break;
default: default:
impossible("strange truth value for rumor"); impossible("strange truth value for rumor");
@@ -305,7 +305,7 @@ char *buf;
(void) dlb_fseek(fh, 0L, SEEK_END); (void) dlb_fseek(fh, 0L, SEEK_END);
endtxt = dlb_ftell(fh); endtxt = dlb_ftell(fh);
sizetxt = endtxt - starttxt; sizetxt = endtxt - starttxt;
tidbit = Rand() % sizetxt; tidbit = rn2(sizetxt);
(void) dlb_fseek(fh, starttxt + tidbit, SEEK_SET); (void) dlb_fseek(fh, starttxt + tidbit, SEEK_SET);
(void) dlb_fgets(line, sizeof line, fh); (void) dlb_fgets(line, sizeof line, fh);