summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/random.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2010-03-05 17:14:55 +0100
committerRobert Vollmert <rvollmert@gmx.net>2010-03-05 17:20:42 +0100
commit17b474f8c5905fd706872564855cf2b8b97597e9 (patch)
tree0042cad4abb875977f10428e9d16e59e493d3466 /crawl-ref/source/random.cc
parentc71c7967be0b47ee7bdb9be48a869a7e44ca732b (diff)
downloadcrawl-ref-17b474f8c5905fd706872564855cf2b8b97597e9.tar.gz
crawl-ref-17b474f8c5905fd706872564855cf2b8b97597e9.zip
Make sure maybe_random2 doesn't return negative values.
Fixes issue #1014.
Diffstat (limited to 'crawl-ref/source/random.cc')
-rw-r--r--crawl-ref/source/random.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/random.cc b/crawl-ref/source/random.cc
index 4a156ede7f..d4fdb9baeb 100644
--- a/crawl-ref/source/random.cc
+++ b/crawl-ref/source/random.cc
@@ -116,6 +116,8 @@ bool coinflip(void)
// Returns random2(x) if random_factor is true, otherwise the mean.
int maybe_random2(int x, bool random_factor)
{
+ if (x <= 1)
+ return (0);
if (random_factor)
return (random2(x));
else