Replace PRNG assertions with PrngException

kwolekr · kwolekr · commit cd1d625ab21e · 2015-04-27T01:24:37.000-04:00
diff --git a/src/exceptions.h b/src/exceptions.h
@@ -120,6 +120,11 @@ class ClientStateError : public BaseException {
 	ClientStateError(std::string s): BaseException(s) {}
 };
 
+class PrngException : public BaseException {
+public:
+	PrngException(std::string s): BaseException(s) {}
+};
+
 /*
 	Some "old-style" interrupts:
 */
diff --git a/src/noise.cpp b/src/noise.cpp
@@ -115,7 +115,9 @@ u32 PcgRandom::range(u32 bound)
 
 s32 PcgRandom::range(s32 min, s32 max)
 {
-	assert(max >= min);
+	if (max < min)
+		throw PrngException("Invalid range (max < min)");
+
 	u32 bound = max - min + 1;
 	return range(bound) + min;
 }
diff --git a/src/noise.h b/src/noise.h
@@ -26,8 +26,8 @@
 #ifndef NOISE_HEADER
 #define NOISE_HEADER
 
-#include "debug.h"
 #include "irr_v3d.h"
+#include "exceptions.h"
 #include "util/string.h"
 
 extern FlagDesc flagdesc_noiseparams[];
@@ -56,14 +56,16 @@ class PseudoRandom {
 
 	inline int range(int min, int max)
 	{
-		assert(max >= min);
+		if (max < min)
+			throw PrngException("Invalid range (max < min)");
 		/*
 		Here, we ensure the range is not too large relative to RANDOM_MAX,
 		as otherwise the effects of bias would become noticable.  Unlike
 		PcgRandom, we cannot modify this RNG's range as it would change the
 		output of this RNG for reverse compatibility.
 		*/
-		assert((u32)(max - min) <= (RANDOM_RANGE + 1) / 10);
+		if ((u32)(max - min) > (RANDOM_RANGE + 1) / 10)
+			throw PrngException("Range too large");
 
 		return (next() % (max - min + 1)) + min;
 	}

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,9 @@ u32 PcgRandom::range(u32 bound)`
`115`	`115`
`116`	`116`	`s32 PcgRandom::range(s32 min, s32 max)`
`117`	`117`	`{`
`118`		`- assert(max >= min);`
	`118`	`+ if (max < min)`
	`119`	`+ throw PrngException("Invalid range (max < min)");`
	`120`	`+`
`119`	`121`	`u32 bound = max - min + 1;`
`120`	`122`	`return range(bound) + min;`
`121`	`123`	`}`