Fix int overflow in radar blip drawing. Closes ticket:2731, reviewed …

…by Safety0ff.
Warzone2100 · May 22, 2011 · 10249e5 · 10249e5
1 parent 8aca943
commit 10249e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/ivis_opengl/piedraw.cpp b/lib/ivis_opengl/piedraw.cpp
@@ -477,6 +477,8 @@ void pie_Draw3DShape(iIMDShape *shape, int frame, int team, PIELIGHT colour, int
 
 	pieCount++;
 
+	ASSERT(frame >= 0, "Negative frame %d", frame);
+	ASSERT(team >= 0, "Negative team %d", team);
 	if (frame == 0)
 	{
 		frame = team;

diff --git a/src/component.cpp b/src/component.cpp
@@ -992,7 +992,6 @@ void displayComponentButtonObject(DROID *psDroid, Vector3i *Rotation, Vector3i *
 void displayComponentObject(DROID *psDroid)
 {
 	Vector3i	position, rotation;
-	SDWORD		frame;
 	UDWORD	tileX,tileY;
 	MAPTILE	*psTile;
 	Spacetime st = interpolateObjectSpacetime(psDroid, graphicsTime);
@@ -1060,9 +1059,8 @@ void displayComponentObject(DROID *psDroid)
 			psTile = mapTile(tileX,tileY);
 			if (terrainType(psTile) != TER_WATER)
 			{
-				frame = gameTime/BLIP_ANIM_DURATION + psDroid->id; //visible[selectedPlayer];
+				int frame = gameTime/BLIP_ANIM_DURATION + psDroid->id % 8192; // de-sync the blip effect, but don't overflow the int
 				pie_Draw3DShape(getImdFromIndex(MI_BLIP), frame, 0, WZCOL_WHITE, pie_ADDITIVE, psDroid->visible[selectedPlayer] / 2);
-				/* set up all the screen coords stuff - need to REMOVE FROM THIS LOOP */
 			}
 		}
 	}