aboutsummaryrefslogtreecommitdiff
path: root/engines/dreamweb/rain.cpp
diff options
context:
space:
mode:
authorBertrand Augereau2012-03-03 05:31:19 -0800
committerBertrand Augereau2012-03-03 05:31:19 -0800
commit2ade3b12be7135111815f066e18b16b0a4984c3b (patch)
tree6ae9fde832e46efef40996dc023ae8c50c88bd62 /engines/dreamweb/rain.cpp
parent1098e6b79afb9208b3558bc0401afa0027179fbb (diff)
parent261fc2f4beb0aef9ab0a32afdedac4a87561f26f (diff)
downloadscummvm-rg350-2ade3b12be7135111815f066e18b16b0a4984c3b.tar.gz
scummvm-rg350-2ade3b12be7135111815f066e18b16b0a4984c3b.tar.bz2
scummvm-rg350-2ade3b12be7135111815f066e18b16b0a4984c3b.zip
Merge pull request #205 from eriktorbjorn/dreamweb-random
DREAMWEB: Simplify some uses of randomNumber()
Diffstat (limited to 'engines/dreamweb/rain.cpp')
-rw-r--r--engines/dreamweb/rain.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/engines/dreamweb/rain.cpp b/engines/dreamweb/rain.cpp
index 0a8ee2a38e..7db4744cbf 100644
--- a/engines/dreamweb/rain.cpp
+++ b/engines/dreamweb/rain.cpp
@@ -104,8 +104,8 @@ void DreamWebEngine::splitIntoLines(uint8 x, uint8 y) {
}
rain.size = length;
- rain.w3 = (randomNumber() << 8) | randomNumber();
- rain.b5 = (randomNumber() & 3) + 4;
+ rain.w3 = _rnd.getRandomNumber(65535);
+ rain.b5 = _rnd.getRandomNumberRng(4, 7);
_rainList.push_back(rain);
} while (x > 0 && y < _mapYSize);
}
@@ -170,11 +170,7 @@ void DreamWebEngine::initRain() {
// start lines of rain from top of screen
uint8 x = 4;
do {
- uint8 delta;
- do {
- delta = (randomNumber() & 31) + 3;
- } while (delta >= rainSpacing);
-
+ uint8 delta = _rnd.getRandomNumberRng(3, rainSpacing - 1);
x += delta;
if (x >= _mapXSize)
break;
@@ -185,11 +181,7 @@ void DreamWebEngine::initRain() {
// start lines of rain from side of screen
uint8 y = 0;
do {
- uint8 delta;
- do {
- delta = (randomNumber() & 31) + 3;
- } while (delta >= rainSpacing);
-
+ uint8 delta = _rnd.getRandomNumberRng(3, rainSpacing - 1);
y += delta;
if (y >= _mapYSize)
break;