thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DREAMWEB: Simplify some uses of randomNumber()

Browse source 
Our random number generator isn't restricted to producing numbers
between 0 and 255. We can just ask it for the desired range.
This commit is contained in:
Torbjörn Andersson 2012-03-03 13:55:04 +01:00
parent 1098e6b79a
commit 261fc2f4be
4 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/dreamweb/monitor.cpp
View file

@ -320,7 +320,7 @@ void DreamWebEngine::randomAccess(uint16 count) {
for (uint16 i = 0; i < count; ++i) { for (uint16 i = 0; i < count; ++i) {
vSync(); vSync();
vSync(); vSync();
uint16 v = randomNumber() & 15; uint16 v = _rnd.getRandomNumber(15);
if (v < 10) if (v < 10)
accessLightOff(); accessLightOff();
else else

2
engines/dreamweb/people.cpp
View file

@ -262,7 +262,7 @@ void DreamWebEngine::gamer(ReelRoutine &routine) {
if (checkSpeed(routine)) { if (checkSpeed(routine)) {
uint8 v; uint8 v;
do { do {
v = 20 + randomNumber() % 5; v = _rnd.getRandomNumberRng(20, 24);
} while (v == routine.reelPointer()); } while (v == routine.reelPointer());
routine.setReelPointer(v); routine.setReelPointer(v);
} }

16
engines/dreamweb/rain.cpp
View file

@ -104,8 +104,8 @@ void DreamWebEngine::splitIntoLines(uint8 x, uint8 y) {
} }
rain.size = length; rain.size = length;
rain.w3 = (randomNumber() << 8) | randomNumber(); rain.w3 = _rnd.getRandomNumber(65535);
rain.b5 = (randomNumber() & 3) + 4; rain.b5 = _rnd.getRandomNumberRng(4, 7);
_rainList.push_back(rain); _rainList.push_back(rain);
} while (x > 0 && y < _mapYSize); } while (x > 0 && y < _mapYSize);
} }
@ -170,11 +170,7 @@ void DreamWebEngine::initRain() {
// start lines of rain from top of screen // start lines of rain from top of screen
uint8 x = 4; uint8 x = 4;
do { do {
uint8 delta; uint8 delta = _rnd.getRandomNumberRng(3, rainSpacing - 1);
do {
delta = (randomNumber() & 31) + 3;
} while (delta >= rainSpacing);
x += delta; x += delta;
if (x >= _mapXSize) if (x >= _mapXSize)
break; break;
@ -185,11 +181,7 @@ void DreamWebEngine::initRain() {
// start lines of rain from side of screen // start lines of rain from side of screen
uint8 y = 0; uint8 y = 0;
do { do {
uint8 delta; uint8 delta = _rnd.getRandomNumberRng(3, rainSpacing - 1);
do {
delta = (randomNumber() & 31) + 3;
} while (delta >= rainSpacing);
y += delta; y += delta;
if (y >= _mapYSize) if (y >= _mapYSize)
break; break;

4
engines/dreamweb/sprite.cpp
View file

@ -263,8 +263,8 @@ void DreamWebEngine::constant(Sprite *sprite, SetObject *objData) {
} }
void DreamWebEngine::randomSprite(Sprite *sprite, SetObject *objData) { void DreamWebEngine::randomSprite(Sprite *sprite, SetObject *objData) {
uint8 r = randomNumber(); uint8 r = _rnd.getRandomNumber(7);
sprite->frameNumber = objData->frames[r&7]; sprite->frameNumber = objData->frames[r];
} }
void DreamWebEngine::doorway(Sprite *sprite, SetObject *objData) { void DreamWebEngine::doorway(Sprite *sprite, SetObject *objData) {