PseudoRandom: Expose constant PSEUDORANDOM_MAX

kwolekr · kwolekr · commit 8c98f497d957 · 2014-12-28T03:09:32.000-05:00
diff --git a/src/noise.h b/src/noise.h
@@ -30,6 +30,8 @@
 #include "irr_v3d.h"
 #include "util/string.h"
 
+#define PSEUDORANDOM_MAX 32767
+
 extern FlagDesc flagdesc_noiseparams[];
 
 class PseudoRandom
@@ -45,15 +47,15 @@ class PseudoRandom
 	{
 		m_next = seed;
 	}
-	// Returns 0...32767
+	// Returns 0...PSEUDORANDOM_MAX
 	int next()
 	{
 		m_next = m_next * 1103515245 + 12345;
-		return((unsigned)(m_next/65536) % 32768);
+		return((unsigned)(m_next/65536) % (PSEUDORANDOM_MAX + 1));
 	}
 	int range(int min, int max)
 	{
-		if(max-min > 32768/10)
+		if (max-min > (PSEUDORANDOM_MAX + 1) / 10)
 		{
 			//dstream<<"WARNING: PseudoRandom::range: max > 32767"<<std::endl;
 			assert(0);

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@`
`30`	`30`	`#include "irr_v3d.h"`
`31`	`31`	`#include "util/string.h"`
`32`	`32`
	`33`	`+#define PSEUDORANDOM_MAX 32767`Has a conversation. Original line has a conversation.
	`34`	`+`
`33`	`35`	`extern FlagDesc flagdesc_noiseparams[];`
`34`	`36`
`35`	`37`	`class PseudoRandom`
`@@ -45,15 +47,15 @@ class PseudoRandom`
`45`	`47`	`{`
`46`	`48`	`m_next = seed;`
`47`	`49`	`}`
`48`		`- // Returns 0...32767`
	`50`	`+ // Returns 0...PSEUDORANDOM_MAX`
`49`	`51`	`int next()`
`50`	`52`	`{`
`51`	`53`	`m_next = m_next * 1103515245 + 12345;`
`52`		`- return((unsigned)(m_next/65536) % 32768);`
	`54`	`+ return((unsigned)(m_next/65536) % (PSEUDORANDOM_MAX + 1));`
`53`	`55`	`}`
`54`	`56`	`int range(int min, int max)`
`55`	`57`	`{`
`56`		`- if(max-min > 32768/10)`
	`58`	`+ if (max-min > (PSEUDORANDOM_MAX + 1) / 10)`
`57`	`59`	`{`
`58`	`60`	`//dstream<<"WARNING: PseudoRandom::range: max > 32767"<<std::endl;`
`59`	`61`	`assert(0);`