Allow rng to accept parameters in swapped order

Fris0uman · Jun 26, 2013 · 5dc2f67 · 5dc2f67
1 parent ca2d29a
commit 5dc2f67
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/rng.cpp b/rng.cpp
@@ -2,9 +2,17 @@
 #include "rng.h"
 #include <stdlib.h>
 
-long rng(long low, long high)
+long rng(long val1, long val2)
 {
- return low + long((high - low + 1) * double(rand() / double(RAND_MAX + 1.0)));
+    // Input order of parameters doesn't matter, we just swap things around if val1 is higher than val2.
+    if(val1 <= val2)
+    {
+        return val1 + long((val2 - val1 + 1) * double(rand() / double(RAND_MAX + 1.0)));
+    }
+    else
+    {
+        return val2 + long((val1 - val2 + 1) * double(rand() / double(RAND_MAX + 1.0)));
+    }
 }
 
 bool one_in(int chance)

diff --git a/rng.h b/rng.h
@@ -1,7 +1,7 @@
 #ifndef _RNG_H_
 #define _RNG_H_
 
-long rng(long low, long high);
+long rng(long val1, long val2);
 bool one_in(int chance);
 bool x_in_y(double x, double y);
 int dice(int number, int sides);