X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=random.c;h=c81dffa5ea3772717f5d9d970d68c5c9be523631;hb=2fc464b1e03445cd60e9305dc9b75471ebdb04af;hp=5657eedeb9d3663f9941180e39104c2fdce2faa0;hpb=6ee2d4c247b82dc4aea6e9e5e6aecd7d857aaafd;p=physik%2Fmorpheus.git

diff --git a/random.c b/random.c
index 5657eed..c81dffa 100644
--- a/random.c
+++ b/random.c
@@ -6,6 +6,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "defines.h"
 
@@ -13,18 +15,27 @@
 extern u32 gr;
 extern int random_fd;
 extern u32 *rand_buf,*rand_current;
+extern char random_file[MAX_CHARS_RANDOM_FILE];
 
 /* return random integer between 0 - max-1 */
 u32 rand_get(u32 max) 
 {
- if(rand_current==rand_buf+RAND_BUF_SIZE)
+ if(rand_current>=rand_buf+(RAND_BUF_SIZE/sizeof(u32)))
  {
   printfd("debug: reading new random bytes\n");
   if(read(random_fd,rand_buf,RAND_BUF_SIZE)!=RAND_BUF_SIZE)
   {
-   puts("failed reading viel bytes of random data");
-   return -23;
+   if(!strcmp(random_file,""))
+   {
+    puts("random file end, starting over ...");
+    lseek(random_fd,0,SEEK_SET);
+   } else
+   {
+    puts("failed reading 1 mega bytes of random data");
+    return -23;
+   }
   }
+  printfd("debug: finished reading random bytes\n");
   rand_current=rand_buf;
  }
  /* cells numbered 0...max-1 */
@@ -32,14 +43,15 @@ u32 rand_get(u32 max)
 }
 
 /* get z value (linear growth of probability with depths) */
-u32 rand_get_lgp(int slope_nel,int start_nel,u32 z_max)
+u32 rand_get_lgp(int slope,int start,u32 z_max)
 {
  int z;
  u32 i,weighted_sum_z;
- weighted_sum_z=z_max*start_nel+slope_nel*gr;
+ weighted_sum_z=z_max*start+slope*gr;
  z=rand_get(weighted_sum_z)+1; /* +1 as rand_get returns values 0...max-1 */
- for(i=1;;i++) {
-  z-=(start_nel+i*slope_nel);
+ for(i=1;;i++)
+ {
+  z-=(start+i*slope);
   if(z<=0) break;
  }
  return(i-1); /* return values 0...z_cell-1 */