Lua capabilities for icons in the form of a Primitive function and width/height getters

Author: fourZK

Entities/MOSprite.h

@@ -393,6 +393,17 @@ class MOSprite : public MovableObject {
 	/// <returns>The graphical representation of this MOSprite as a BITMAP.</returns>
 	BITMAP *GetGraphicalIcon() const override { return m_GraphicalIcon != nullptr ? m_GraphicalIcon : m_aSprite[0]; }
 
+	/// <summary>
+	/// Gets the width of this MOSprite's GUI icon.
+	/// </summary>
+	/// <returns>The width of the GUI icon bitmap.</returns>
+	int GetIconWidth() const { return GetGraphicalIcon()->w; }
+
+	/// <summary>
+	/// Gets the height of this MOSprite's GUI icon.
+	/// </summary>
+	/// <returns>The height of the GUI icon bitmap.</returns>
+	int GetIconHeight() const { return GetGraphicalIcon()->h; }
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Lua/LuaBindingsEntities.cpp

@@ -792,6 +792,8 @@ namespace RTE {
 		.def("FacingAngle", &MOSprite::FacingAngle)
 		.def("GetSpriteWidth", &MOSprite::GetSpriteWidth)
 		.def("GetSpriteHeight", &MOSprite::GetSpriteHeight)
+		.def("GetIconWidth", &MOSprite::GetIconWidth)
+		.def("GetIconHeight", &MOSprite::GetIconHeight)
 		.def("SetEntryWound", &MOSprite::SetEntryWound)
 		.def("SetExitWound", &MOSprite::SetExitWound)
 		.def("GetEntryWoundPresetName", &MOSprite::GetEntryWoundPresetName)

Lua/LuaBindingsManagers.cpp

@@ -229,7 +229,9 @@ namespace RTE {
 		.def("DrawBitmapPrimitive", (void (PrimitiveMan::*)(const Vector &start, Entity *entity, float rotAngle, int frame))&PrimitiveMan::DrawBitmapPrimitive)
 		.def("DrawBitmapPrimitive", (void (PrimitiveMan::*)(const Vector &start, Entity *entity, float rotAngle, int frame, bool hFlipped, bool vFlipped))&PrimitiveMan::DrawBitmapPrimitive)
 		.def("DrawBitmapPrimitive", (void (PrimitiveMan::*)(int player, const Vector &start, Entity *entity, float rotAngle, int frame))&PrimitiveMan::DrawBitmapPrimitive)
-		.def("DrawBitmapPrimitive", (void (PrimitiveMan::*)(int player, const Vector &start, Entity *entity, float rotAngle, int frame, bool hFlipped, bool vFlipped))&PrimitiveMan::DrawBitmapPrimitive);
+		.def("DrawBitmapPrimitive", (void (PrimitiveMan::*)(int player, const Vector &start, Entity *entity, float rotAngle, int frame, bool hFlipped, bool vFlipped))&PrimitiveMan::DrawBitmapPrimitive)
+		.def("DrawIconPrimitive", (void (PrimitiveMan::*)(const Vector &start, Entity *entity))&PrimitiveMan::DrawIconPrimitive)
+		.def("DrawIconPrimitive", (void (PrimitiveMan::*)(int player, const Vector &start, Entity *entity))&PrimitiveMan::DrawIconPrimitive);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Managers/PrimitiveMan.cpp

@@ -14,6 +14,12 @@ namespace RTE {
 		}
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void PrimitiveMan::DrawIconPrimitive(int player, const Vector &centerPos, Entity *entity) {
+		if (const MOSprite *moSprite = dynamic_cast<MOSprite *>(entity)) { m_ScheduledPrimitives.push_back(std::make_unique<BitmapPrimitive>(player, centerPos, moSprite->GetGraphicalIcon(), 0, false, false)); }
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void PrimitiveMan::DrawPrimitives(int player, BITMAP *targetBitmap, const Vector &targetPos) const {

Managers/PrimitiveMan.h

@@ -364,6 +364,21 @@ namespace RTE {
 		/// <param name="hFlipped">Whether to flip the sprite horizontally.</param>
 		/// <param name="vFlipped">Whether to flip the sprite vertically.</param>
 		void DrawBitmapPrimitive(int player, const Vector &centerPos, Entity *entity, float rotAngle, int frame, bool hFlipped, bool vFlipped);
+
+		/// <summary>
+		/// Schedule to draw the GUI icon of an object.
+		/// </summary>
+		/// <param name="centerPos">Position of primitive's center in scene coordinates.</param>
+		/// <param name="entity">An entity to draw sprite from.</param>
+		void DrawIconPrimitive(const Vector &centerPos, Entity *entity) { DrawIconPrimitive(-1, centerPos, entity); }
+
+		/// <summary>
+		/// Schedule to draw the GUI icon of an object, visible only to a specified player.
+		/// </summary>
+		/// <param name="player">Player screen to draw primitive on.</param>
+		/// <param name="centerPos">Position of primitive's center in scene coordinates.</param>
+		/// <param name="entity">An entity to draw sprite from.</param>
+		void DrawIconPrimitive(int player, const Vector &centerPos, Entity *entity);
 #pragma endregion
 
 	protected: