diff options
author | Filippos Karapetis | 2007-09-21 20:06:57 +0000 |
---|---|---|
committer | Filippos Karapetis | 2007-09-21 20:06:57 +0000 |
commit | 8663e5a39fdd8b65011a396b1ec029559c87e331 (patch) | |
tree | 49b3774e721a9266bbaca2abfeba270c475726e7 /engines | |
parent | 2310d1f62a1f1124b493d9d7d6a3a3574217b5e6 (diff) | |
download | scummvm-rg350-8663e5a39fdd8b65011a396b1ec029559c87e331.tar.gz scummvm-rg350-8663e5a39fdd8b65011a396b1ec029559c87e331.tar.bz2 scummvm-rg350-8663e5a39fdd8b65011a396b1ec029559c87e331.zip |
Cleanup
svn-id: r29009
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agi/preagi_mickey.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 056e556f58..8269f2e5f0 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -71,6 +71,7 @@ void Mickey::readDatHdr(char *szFile, MSA_DAT_HEADER *hdr) { hdr->filelen = infile.readByte(); hdr->filelen += infile.readByte() * 0x100; + for (int i = 0; i < IDI_MSA_MAX_ROOM; i++) { hdr->ofsRoom[i] = infile.readByte(); hdr->ofsRoom[i] += infile.readByte() * 0x100; @@ -223,6 +224,7 @@ void Mickey::printExeStr(int ofs) { void Mickey::printExeMsg(int ofs) { if (!ofs) return; + printExeStr(ofs); waitAnyKeyAnim(); } @@ -943,12 +945,10 @@ void Mickey::animate() { void Mickey::printRoomDesc() { // print room description - printDesc(game.iRoom); waitAnyKeyAnim(); // print extended room description - if (game.fRmTxt[game.iRoom]) { printExeMsg(game.oRmTxt[game.iRoom] + IDI_MSA_OFS_EXE); } @@ -1253,7 +1253,6 @@ void Mickey::inventory() { } void Mickey::randomize() { - int iPlanet = 0; int iHint = 0; memset(game.iPlanetXtal, 0, sizeof(game.iPlanetXtal)); @@ -1265,11 +1264,9 @@ void Mickey::randomize() { 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); + game.iPlanetXtal[i] = _vm->rnd(IDI_MSA_MAX_PLANET - 2); } while (planetIsAlreadyAssigned(iPlanet)); - game.iPlanetXtal[i] = iPlanet; - iHint = _vm->rnd(5) - 1; // clues are 0-4 game.iClue[i] = IDO_MSA_NEXT_PIECE[iPlanet][iHint]; } |