libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplified Mickey::randomize()

Browse Source 
svn-id: r29008
This commit is contained in:
Filippos Karapetis 2007-09-21 19:35:26 +00:00
parent dc4c06e954
commit 2310d1f62a
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/agi/preagi_mickey.cpp
View File

@ -1255,7 +1255,6 @@ void Mickey::inventory() {
void Mickey::randomize() {
int iPlanet = 0;
int iHint = 0;
bool done;
memset(game.iPlanetXtal, 0, sizeof(game.iPlanetXtal));
memset(game.iClue, 0, sizeof(game.iClue));
@ -1263,22 +1262,11 @@ void Mickey::randomize() {
game.iPlanetXtal[0] = IDI_MSA_PLANET_EARTH;
game.iPlanetXtal[8] = IDI_MSA_PLANET_URANUS;
for (int i = 1; i < 9; i++) {
if (i == 8) {
iPlanet = IDI_MSA_PLANET_URANUS;
} else {
done = false;
while (!done) {
iPlanet = _vm->rnd(IDI_MSA_MAX_PLANET - 2); // Earth (planet 0) is excluded
done = true;
for (int j = 0; j < IDI_MSA_MAX_PLANET; j++) {
if (game.iPlanetXtal[j] == iPlanet) {
done = false;
break;
}
}
}
}
for (int i = 1; i < 8; i++) {
do {
// Earth (planet 0) and Uranus (planet 8) are excluded
iPlanet = _vm->rnd(IDI_MSA_MAX_PLANET - 2);
} while (planetIsAlreadyAssigned(iPlanet));
game.iPlanetXtal[i] = iPlanet;

9
engines/agi/preagi_mickey.h
View File

@ -732,7 +732,6 @@ struct MSA_GAME {
class Mickey {
friend class PreAgiEngine;
public:
Mickey(PreAgiEngine *vm);
~Mickey();
@ -803,6 +802,14 @@ protected:
void flipSwitch();
void waitAnyKeyAnim();
void waitAnyKey(bool anim = false);
bool planetIsAlreadyAssigned(int planet) {
for (int j = 0; j < IDI_MSA_MAX_PLANET; j++) {
if (game.iPlanetXtal[j] == planet)
return true;
}
return false;
}
};
} // End of namespace Agi