[Scummvm-cvs-logs] SF.net SVN: scummvm: [29009] scummvm/trunk/engines/agi/preagi_mickey.cpp

[thebluegr at users.sourceforge.net]

Revision: 29009
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29009&view=rev
Author:   thebluegr
Date:     2007-09-21 13:06:57 -0700 (Fri, 21 Sep 2007)

Log Message:
-----------
Cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/agi/preagi_mickey.cpp

Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-21 19:35:26 UTC (rev 29008)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-21 20:06:57 UTC (rev 29009)
@@ -71,6 +71,7 @@
 
 	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::printExeMsg(int ofs) {
 	if (!ofs)
 		return;
+
 	printExeStr(ofs);
 	waitAnyKeyAnim();
 }
@@ -943,12 +945,10 @@
 
 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::randomize() {
-	int iPlanet = 0;
 	int iHint = 0;
 
 	memset(game.iPlanetXtal, 0, sizeof(game.iPlanetXtal));
@@ -1265,11 +1264,9 @@
 	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];
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.