summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2009-09-30 13:58:34 -0400
committerMadCamel <madcamel@gmail.com>2009-09-30 13:58:34 -0400
commit592170e732fd5b75cf1447ed33e8999541048db8 (patch)
treed3ba7169a077ea7975c41c3ab68027be747df017 /src/common
parent3fc3d83aa0be31e6d51afac54ff76b447f99f711 (diff)
parentbf517943387f364ad7b11854d803a84612f8cf60 (diff)
downloadtmwa-592170e732fd5b75cf1447ed33e8999541048db8.tar.gz
tmwa-592170e732fd5b75cf1447ed33e8999541048db8.tar.bz2
tmwa-592170e732fd5b75cf1447ed33e8999541048db8.tar.xz
tmwa-592170e732fd5b75cf1447ed33e8999541048db8.zip
Merge branch 'master' of git@gitorious.org:~madcamel/tmw-eathena/thealternateworld
Conflicts: src/common/utils.h
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mt_rand.c9
-rw-r--r--src/common/mt_rand.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/src/common/mt_rand.c b/src/common/mt_rand.c
index ab733ae..fc9a9ec 100644
--- a/src/common/mt_rand.c
+++ b/src/common/mt_rand.c
@@ -108,3 +108,12 @@ unsigned long mt_random(void)
y ^= (y << 15) & 0xEFC60000U;
return(y ^ (y >> 18));
}
+
+int mt_rand(void) {
+ unsigned long r = mt_random();
+ while (r >> 16)
+ r = (r & 0xFFFF) + (r >> 16);
+
+ return(r);
+}
+
diff --git a/src/common/mt_rand.h b/src/common/mt_rand.h
index 07f6ef0..bda5861 100644
--- a/src/common/mt_rand.h
+++ b/src/common/mt_rand.h
@@ -4,5 +4,6 @@
void mt_seed(unsigned long seed);
unsigned long mt_reload(void);
unsigned long mt_random(void);
+int mt_rand(void);
#endif /* __mt_rand_h */