Changeset 707

Timestamp:

02/16/08 09:04:45 (9 months ago)

Author:

takkaria

Message:

• Make rand_range() a function, so assert()s can be added
  
• Add an assert to Rand_div()
  
• Fix store bug reported by Pete Mack
  

Files:

• trunk/src/melee1.c (modified) (1 diff)
• trunk/src/store.c (modified) (2 diffs)
• trunk/src/z-rand.c (modified) (5 diffs)
• trunk/src/z-rand.h (modified) (2 diffs)

trunk/src/melee1.c

@@ -447 +447 @@
-
-                        /* Roll out the damage */
-
+
+
+
+
-
-                        /* Apply appropriate damage */

trunk/src/store.c

@@ -1214 +1214 @@
-
-        /*
- 
+
-         */
-        if (st == STORE_B_MARKET)
@@ -1227 +1227 @@
-        }
-
-6
+5
-        if (max_level > 70) max_level = 70;
-

trunk/src/z-rand.c

@@ -118 +118 @@
- * This method has no bias, and is much less affected by patterns
- * in the "low" bits of the underlying RNG's.
- *
- * Note that "m" must not be greater than 0x1000000, or division
- * by zero will result.
- *
- * ToDo: Check for m > 0x1000000.
- */
-u32b Rand_div(u32b m)
-{
-        u32b r, n;
+
+        /* Division by zero will result if m is larger than 0x10000000 */
+        assert(m <= 0x10000000);
-
-        /* Hack -- simple case */
@@ -199 +197 @@
-static s16b Rand_normal_table[RANDNOR_NUM] =
-{
-1022,    1430,                1838,    2245,    2652, 
-       5075,    5475,    5874, 
-       8234,    8621,    9006, 
-
+ 1022,    1430,               1838,    2245,     2652,  
+    5075,    5475,     5874,  
+    8234,    8621,     9006,  
+ 
-        12727,   13085,   13440,   13792,   14140,      14486,   14828,   15168,
-        15504,   15836,   16166,   16492,   16814,      17133,   17449,   17761,
@@ -306 +304 @@
- * "external" program parts like the main-*.c files.  It preserves
- * the current RNG state to prevent influences on game-play.
- *
- * Could also use rand() from <stdlib.h> directly. XXX XXX XXX
- */
-u32b Rand_simple(u32b m)
@@ -361 +357 @@
-        int sum = 0;
-
+/*      assert(sides > 0); */
-        if (sides <= 0) return (0);
-
@@ -369 +366 @@
-}
-
+
+/**
+ * Generates a random signed long integer X where `A` <= X <= `B`.
+ * The integer X falls along a uniform distribution.
+ *
+ * Note that "rand_range(0, N-1)" == "rand_int(N)".
+ */
+int rand_range(int A, int B)
+{
+        if (A == B) return A;
+
+        assert(A < B);
+        assert(B > A);
+
+        return A + (s32b)Rand_div(1 + B - A);
+}

trunk/src/z-rand.h

@@ -32 +32 @@
-#define randint(M)              ((s32b) Rand_div(M) + 1)
-#define rand_die(M)             (rand_int(M) + 1)
-
-
-/**
- * Generates a random signed long integer X where "A <= X <= B"
- * Note that "rand_range(0, N-1)" == "rand_int(N)"
- *
- * The integer X falls along a uniform distribution.
- */
-#define rand_range(A,B)         ((A) + (rand_int(1+(B)-(A))))
-
-
@@ -100 +91 @@
-int damroll(int num, int sides);
-
+/**
+ * Generates a random signed long integer X where "A <= X <= B"
+ * Note that "rand_range(0, N-1)" == "rand_int(N)"
+ *
+ * The integer X falls along a uniform distribution.
+ */
+int rand_range(int A, int B);
+
-
-#endif /* INCLUDED_Z_RAND_H */