Fix hardcoded number of frames for structure animations.

N.B. Animation rates remain hardcoded for now. Closes #1871. (cherry picked from commit 55bea09) (cherry picked from commit 02ced5e)
Warzone2100 · Jun 16, 2012 · 190c7a9 · 190c7a9
1 parent 6ff93f6
commit 190c7a9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/display3d.cpp b/src/display3d.cpp
@@ -2224,11 +2224,10 @@ void	renderStructure(STRUCTURE *psStructure)
 	colour = getPlayerColour(psStructure->player);
 	animFrame = 0;
 
-	/* Power stations and factories have pulsing lights. Hack for fortresses, since they need team colour. */
-	if (!defensive && psStructure->sDisplay.imd->numFrames > 0 && !(bMultiPlayer && psStructure->pStructureType->type == REF_BLASTDOOR))
+	if (strImd->numFrames > 0)
 	{
 		// Calculate an animation frame
-		animFrame = getModularScaledGraphicsTime(STRUCTURE_ANIM_RATE*GAME_TICKS_PER_SEC, STRUCTURE_ANIM_RATE);
+		animFrame = getModularScaledGraphicsTime(STRUCTURE_ANIM_RATE*GAME_TICKS_PER_SEC, strImd->numFrames);
 	}
 
 	// -------------------------------------------------------------------------------