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

[thebluegr at users.sourceforge.net]

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

Log Message:
-----------
Fix regression caused by the latest cleanups

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 20:08:42 UTC (rev 29010)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-21 20:19:12 UTC (rev 29011)
@@ -1254,6 +1254,7 @@
 
 void Mickey::randomize() {
 	int iHint = 0;
+	int iPlanet = 0;
 
 	memset(game.iPlanetXtal, 0, sizeof(game.iPlanetXtal));
 	memset(game.iClue, 0, sizeof(game.iClue));
@@ -1264,11 +1265,12 @@
 	for (int i = 1; i < 8; i++) {
 		do {
 			// Earth (planet 0) and Uranus (planet 8) are excluded
-			game.iPlanetXtal[i] = _vm->rnd(IDI_MSA_MAX_PLANET - 2);
-		} while (planetIsAlreadyAssigned(game.iPlanetXtal[i]));
+			iPlanet = _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[game.iPlanetXtal[i]][iHint];
+		game.iClue[i] = IDO_MSA_NEXT_PIECE[iPlanet][iHint];
 	}
 
 	game.fPlanetsInitialized = true;


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