Fix leak when drawing flipped bitmap primitives

Author: MaximDude

Managers/PrimitiveMan.cpp

@@ -12,24 +12,7 @@ namespace RTE {
 		const MOSprite *moSprite = dynamic_cast<MOSprite *>(entity);
 		if (moSprite) {
 			BITMAP *bitmap = moSprite->GetSpriteFrame(frame);
-
-			if (bitmap) {
-				if (!hFlipped && !vFlipped) {
-					m_Primitives.push_back(new BitmapPrimitive(player, centerPos, bitmap, rotAngle));
-				} else {
-					BITMAP *flipBitmap = create_bitmap_ex(8, bitmap->w, bitmap->h);
-					clear_to_color(flipBitmap, 0);
-
-					if (hFlipped && !vFlipped) {
-						draw_sprite_h_flip(flipBitmap, bitmap, 0, 0);
-					} else if (!hFlipped && vFlipped) {
-						draw_sprite_v_flip(flipBitmap, bitmap, 0, 0);
-					} else if (hFlipped && vFlipped) {
-						draw_sprite_vh_flip(flipBitmap, bitmap, 0, 0);
-					}
-					m_Primitives.push_back(new BitmapPrimitive(player, centerPos, flipBitmap, rotAngle));
-				}
-			}
+			if (bitmap) { m_Primitives.push_back(new BitmapPrimitive(player, centerPos, bitmap, rotAngle, hFlipped, vFlipped)); }
 		}
 	}
 

System/Primitive.cpp

@@ -404,6 +404,27 @@ namespace RTE {
 		if (!m_Bitmap) {
 			return;
 		}
+
+		BITMAP *bitmapToDraw = create_bitmap_ex(8, m_Bitmap->w, m_Bitmap->h);
+		clear_to_color(bitmapToDraw, 0);
+		draw_sprite(bitmapToDraw, m_Bitmap, 0, 0);
+
+		if (m_HFlipped || m_VFlipped) {
+			BITMAP *flipBitmap = create_bitmap_ex(8, m_Bitmap->w, m_Bitmap->h);
+			clear_to_color(flipBitmap, 0);
+
+			if (m_HFlipped && !m_VFlipped) {
+				draw_sprite_h_flip(flipBitmap, bitmapToDraw, 0, 0);
+			} else if (!m_HFlipped && m_VFlipped) {
+				draw_sprite_v_flip(flipBitmap, bitmapToDraw, 0, 0);
+			} else if (m_HFlipped && m_VFlipped) {
+				draw_sprite_vh_flip(flipBitmap, bitmapToDraw, 0, 0);
+			}
+
+			draw_sprite(flipBitmap, bitmapToDraw, 0, 0);
+			destroy_bitmap(flipBitmap);
+		}
+
 		Matrix rotation = Matrix(m_RotAngle);
 
 		if (!g_SceneMan.SceneWrapsX() && !g_SceneMan.SceneWrapsY()) {
@@ -419,5 +440,7 @@ namespace RTE {
 			pivot_scaled_sprite(drawScreen, m_Bitmap, drawStartLeft.GetFloorIntX(), drawStartLeft.GetFloorIntY(), m_Bitmap->w / 2, m_Bitmap->h / 2, ftofix(rotation.GetAllegroAngle()), ftofix(1.0));
 			pivot_scaled_sprite(drawScreen, m_Bitmap, drawStartRight.GetFloorIntX(), drawStartRight.GetFloorIntY(), m_Bitmap->w / 2, m_Bitmap->h / 2, ftofix(rotation.GetAllegroAngle()), ftofix(1.0));
 		}
+
+		destroy_bitmap(bitmapToDraw);
 	}
 }

System/Primitive.h

@@ -545,6 +545,8 @@ namespace RTE {
 
 		float m_RotAngle; //!< Angle to rotate bitmap in radians.
 		BITMAP *m_Bitmap; //!< Bitmap to draw.
+		bool m_HFlipped; //!< Whether the Bitmap to draw should be horizontally flipped.
+		bool m_VFlipped; //!< Whether the Bitmap to draw should be vertically flipped.
 
 		/// <summary>
 		/// Constructor method for BitmapPrimitive object.
@@ -553,10 +555,14 @@ namespace RTE {
 		/// <param name="pos">Position of this primitive's center.</param>
 		/// <param name="bitmap">Bitmap to draw.</param>
 		/// <param name="rotAngle">Angle to rotate bitmap in radians.</param>
-		BitmapPrimitive(short player, Vector centerPos, BITMAP * bitmap, float rotAngle) {
+		/// <param name="hFlipped">Whether the bitmap to draw should be horizontally flipped.</param>
+		/// <param name="vFlipped">Whether the bitmap to draw should be vertically flipped.</param>
+		BitmapPrimitive(short player, Vector centerPos, BITMAP * bitmap, float rotAngle, bool hFlipped, bool vFlipped) {
 			m_StartPos = centerPos;
 			m_Bitmap = bitmap;
 			m_RotAngle = rotAngle;
+			m_HFlipped = hFlipped;
+			m_VFlipped = vFlipped;
 			m_Player = player;
 		}