diff options
author | Strangerke | 2014-05-19 22:21:27 +0200 |
---|---|---|
committer | Strangerke | 2014-05-19 22:21:27 +0200 |
commit | 081a7ee30cfdf8a29f0cd896eef18b838dd154f8 (patch) | |
tree | 278fc14c3bbb247b52edb79397aaf9beaba5a31c | |
parent | b384447e71af3b10a152f7a3d863e65db525476c (diff) | |
download | scummvm-rg350-081a7ee30cfdf8a29f0cd896eef18b838dd154f8.tar.gz scummvm-rg350-081a7ee30cfdf8a29f0cd896eef18b838dd154f8.tar.bz2 scummvm-rg350-081a7ee30cfdf8a29f0cd896eef18b838dd154f8.zip |
MADS: Refactor a bit the calls of generateRandom()
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 16 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes3.cpp | 7 |
2 files changed, 6 insertions, 17 deletions
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index 0f8af57651..0685cf64f6 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -1198,16 +1198,12 @@ void Scene205::enter() { } void Scene205::step() { - int chanceMajor, chanceMinor; - if (_globals[kSexOfRex] == SEX_FEMALE) { _scene->_kernelMessages.randomServer(); if (_vm->_game->_scene._frameStartTime >= _chickenTime) { - chanceMajor = 100; - chanceMinor = _scene->_kernelMessages.checkRandom() + 1; - - if (_scene->_kernelMessages.generateRandom(chanceMajor, chanceMinor)) + int chanceMinor = _scene->_kernelMessages.checkRandom() + 1; + if (_scene->_kernelMessages.generateRandom(100, chanceMinor)) _vm->_sound->command(28); _chickenTime = _vm->_game->_scene._frameStartTime + 2; @@ -4573,16 +4569,12 @@ void Scene211::enter() { } void Scene211::step() { - int chanceMajor, chanceMinor; - if (_globals[kMonkeyStatus] == MONKEY_AMBUSH_READY) { _scene->_kernelMessages.randomServer(); if (!_ambushFl && !_wakeFl && (_vm->_game->_scene._frameStartTime >= _monkeyTime)) { - chanceMajor = 80; - chanceMinor = _scene->_kernelMessages.checkRandom() * 4 + 1; - - if (_scene->_kernelMessages.generateRandom(chanceMajor, chanceMinor)) + int chanceMinor = _scene->_kernelMessages.checkRandom() * 4 + 1; + if (_scene->_kernelMessages.generateRandom(80, chanceMinor)) _vm->_sound->command(18); _monkeyTime = _vm->_game->_scene._frameStartTime + 2; diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp index 4358aa45b8..f7283c8859 100644 --- a/engines/mads/nebular/nebular_scenes3.cpp +++ b/engines/mads/nebular/nebular_scenes3.cpp @@ -5550,13 +5550,10 @@ void Scene389::enter() { } void Scene389::step() { - int chanceMajor, chanceMinor; - _scene->_kernelMessages.randomServer(); if (_scene->_frameStartTime >= _monsterTime) { - chanceMajor = 20; - chanceMinor = _scene->_kernelMessages.checkRandom() * 4 + 1; - _scene->_kernelMessages.generateRandom(chanceMajor, chanceMinor); + int chanceMinor = _scene->_kernelMessages.checkRandom() * 4 + 1; + _scene->_kernelMessages.generateRandom(20, chanceMinor); _monsterTime = _scene->_frameStartTime + 2; } } |