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

MADS: Introduce another getRandomNumber function with 2 parameters

Browse source
This commit is contained in:
Strangerke 2014-03-22 22:02:52 +01:00
parent eb82e63398
commit c42e831817
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/mads/mads.cpp
View file

@ -107,6 +107,12 @@ int MADSEngine::getRandomNumber(int maxNumber) {
return _randomSource.getRandomNumber(maxNumber); return _randomSource.getRandomNumber(maxNumber);
} }
int MADSEngine::getRandomNumber(int minNumber, int maxNumber) {
int range = maxNumber - minNumber;
return minNumber + _randomSource.getRandomNumber(range);
}
int MADSEngine::hypotenuse(int xv, int yv) { int MADSEngine::hypotenuse(int xv, int yv) {
return (int)sqrt((double)(xv * xv + yv * yv)); return (int)sqrt((double)(xv * xv + yv * yv));
} }

1
engines/mads/mads.h
View file

@ -116,6 +116,7 @@ public:
uint32 getGameFeatures() const; uint32 getGameFeatures() const;
int getRandomNumber(int maxNumber); int getRandomNumber(int maxNumber);
int getRandomNumber(int minNumber, int maxNumber);
int hypotenuse(int xv, int yv); int hypotenuse(int xv, int yv);
}; };

2
engines/mads/nebular/dialogs_nebular.cpp
View file

@ -90,7 +90,7 @@ bool CopyProtectionDialog::getHogAnusEntry(HOGANUS &entry) {
// Read in the total number of entries, and randomly pick an entry to use // Read in the total number of entries, and randomly pick an entry to use
int numEntries = f.readUint16LE(); int numEntries = f.readUint16LE();
int entryIndex = _vm->getRandomNumber(numEntries - 2) + 1; int entryIndex = _vm->getRandomNumber(1, numEntries);
// Read in the encrypted entry // Read in the encrypted entry
f.seek(28 * entryIndex + 2); f.seek(28 * entryIndex + 2);

6
engines/mads/nebular/nebular_scenes2.cpp
View file

@ -462,7 +462,7 @@ void Scene202::enter() {
} }
void Scene202::setRandomKernelMessage() { void Scene202::setRandomKernelMessage() {
int vocabId = 92 + _vm->getRandomNumber(4); int vocabId = _vm->getRandomNumber(92, 96);
_scene->_kernelMessages.reset(); _scene->_kernelMessages.reset();
_game._abortTimersMode2 = ABORTMODE_1; _game._abortTimersMode2 = ABORTMODE_1;
_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 70, 120, _game.getQuote(vocabId)); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 70, 120, _game.getQuote(vocabId));
@ -555,7 +555,7 @@ void Scene202::step() {
} }
if (!_scene->_activeAnimation && (_globals[33] != 2) && (_globals._v7 <= _scene->_frameStartTime) && (_game._scene._v8425C <= _scene->_frameStartTime)) { if (!_scene->_activeAnimation && (_globals[33] != 2) && (_globals._v7 <= _scene->_frameStartTime) && (_game._scene._v8425C <= _scene->_frameStartTime)) {
int randVal = _vm->getRandomNumber(499) + 1; int randVal = _vm->getRandomNumber(1, 500);
int threshold = 1; int threshold = 1;
if (_globals._v4) if (_globals._v4)
threshold = 26; threshold = 26;
@ -614,7 +614,7 @@ void Scene202::step() {
// } // }
warning("TODO: word84260 = _scene->_activeAnimation->getCurrentFrame();"); warning("TODO: word84260 = _scene->_activeAnimation->getCurrentFrame();");
int randVal = _vm->getRandomNumber(999) + 1; int randVal = _vm->getRandomNumber(1, 1000);
int frameStep = -1; int frameStep = -1;
switch (_scene->_activeAnimation->getCurrentFrame()) { switch (_scene->_activeAnimation->getCurrentFrame()) {

2
engines/mads/nebular/nebular_scenes8.cpp
View file

@ -239,7 +239,7 @@ void Scene804::step() {
switch (_scene->_activeAnimation->getCurrentFrame()) { switch (_scene->_activeAnimation->getCurrentFrame()) {
case 1: case 1:
_globals[29] = _vm->getRandomNumber(29) + 1; _globals[29] = _vm->getRandomNumber(1, 30);
switch (_globals[29]) { switch (_globals[29]) {
case 1: case 1:
_globals._v5 = 25; _globals._v5 = 25;