Convert iIMDShape.min/max from Vector3f to Vector3i, since they are u…

…sed in the game state. Don't know if that could cause any desynchs, but better not to risk it.
Warzone2100 · Nov 16, 2010 · 48c4958 · 48c4958
1 parent 6a2991c
commit 48c4958
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ivis_common/ivisdef.h b/lib/ivis_common/ivisdef.h
@@ -77,7 +77,7 @@ typedef struct _iIMDShape {
 	int texpage;
 	int tcmaskpage;
 	int sradius, radius;
-	Vector3f min, max;
+	Vector3i min, max;
 
 	Vector3f ocen;
 	unsigned short numFrames;

diff --git a/lib/ivis_opengl/piedraw.c b/lib/ivis_opengl/piedraw.c
@@ -196,7 +196,7 @@ static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELI
 	}
 	if (pieFlag & pie_RAISE)		// collapse
 	{
-		glTranslatef(1.0f, (-shape->max.y * (pie_RAISE_SCALE - pieFlagData)) / pie_RAISE_SCALE, 1.0f);
+		glTranslatef(1.0f, (-shape->max.y * (pie_RAISE_SCALE - pieFlagData)) * (1.0f / pie_RAISE_SCALE), 1.0f);
 	}
 
 	glColor4ubv(colour.vector);	// Only need to set once for entire model