feat: allow sprite creation in map overlay, improve listener prevents

Author: michyaraque

source/lua/lua_script_manager.cpp

@@ -18,6 +18,7 @@
 #include "main.h"
 #include "lua_script_manager.h"
 #include "lua_api.h"
+#include "lua_api_image.h"
 #include "../gui.h"
 #include "../tile.h"
 
@@ -362,6 +363,32 @@ void LuaScriptManager::collectMapOverlayCommands(const MapViewInfo& view, std::v
 		}
 	};
 
+	ctx["image"] = [&, getOptsTable](sol::variadic_args va) {
+		sol::table opts = getOptsTable(va);
+		if (!opts.valid()) {
+			return;
+		}
+
+		if (opts["image"].valid() && opts["image"].is<LuaAPI::LuaImage>()) {
+			LuaAPI::LuaImage img = opts["image"].get<LuaAPI::LuaImage>();
+			if(img.isSpriteSource()) {
+				MapOverlayCommand cmd;
+				cmd.type = MapOverlayCommand::Type::Sprite;
+				cmd.sprite_id = img.getSpriteId();
+				cmd.screen_space = opts.get_or(std::string("screen"), false);
+				cmd.x = opts.get_or(std::string("x"), 0);
+				cmd.y = opts.get_or(std::string("y"), 0);
+				cmd.z = opts.get_or(std::string("z"), view.floor);
+
+				// Opacity handling
+				double opacity = opts.get_or(std::string("opacity"), 1.0);
+				cmd.color = wxColor(255, 255, 255, static_cast<uint8_t>(opacity * 255));
+
+				out.push_back(cmd);
+			}
+		}
+	};
+
 	std::vector<MapOverlay> sorted = mapOverlays;
 	std::sort(sorted.begin(), sorted.end(), [](const MapOverlay& a, const MapOverlay& b) {
 		if (a.order == b.order) {

source/lua/lua_script_manager.h

@@ -111,7 +111,9 @@ class LuaScriptManager {
 			return;
 		}
 
-		for (auto& listener : eventListeners) {
+		// Iterate over a copy to allow callbacks to modify the listener list safely
+		std::vector<EventListener> listenersCopy = eventListeners;
+		for (const auto& listener : listenersCopy) {
 			if (listener.eventName == eventName && listener.callback.valid()) {
 				try {
 					listener.callback(std::forward<Args>(args)...);
@@ -128,8 +130,10 @@ class LuaScriptManager {
 			return false;
 		}
 
+		// Iterate over a copy to allow callbacks to modify the listener list safely
+		std::vector<EventListener> listenersCopy = eventListeners;
 		bool consumed = false;
-		for (auto& listener : eventListeners) {
+		for (const auto& listener : listenersCopy) {
 			if (listener.eventName == eventName && listener.callback.valid()) {
 				try {
 					sol::object result = listener.callback(std::forward<Args>(args)...);

source/map_drawer.cpp

@@ -380,6 +380,21 @@ bool MapDrawer::drawOverlayCommands(const std::vector<MapOverlayCommand>& comman
 			if (cmd.dashed) {
 				glDisable(GL_LINE_STIPPLE);
 			}
+		} else if (cmd.type == MapOverlayCommand::Type::Sprite) {
+			if (cmd.sprite_id != 0) {
+				if (isScreenSpace) {
+					// Screen space sprite drawing - not implemented fully yet
+					// Need to setup matrix, etc.
+				} else {
+					int screen_x = 0;
+					int screen_y = 0;
+					if (mapToScreen(this, cmd.x, cmd.y, cmd.z, screen_x, screen_y)) {
+						glEnable(GL_TEXTURE_2D);
+						BlitSpriteType(screen_x, screen_y, cmd.sprite_id, cmd.color.Red(), cmd.color.Green(), cmd.color.Blue(), cmd.color.Alpha());
+						glDisable(GL_TEXTURE_2D);
+					}
+				}
+			}
 		} else if (cmd.type == MapOverlayCommand::Type::Text) {
 			if (!cmd.text.empty()) {
 				if (isScreenSpace) {

source/map_overlay.h

@@ -41,6 +41,7 @@ struct MapOverlayCommand {
 		Rect,
 		Line,
 		Text,
+		Sprite,
 	};
 
 	Type type = Type::Rect;
@@ -58,6 +59,8 @@ struct MapOverlayCommand {
 	int y2 = 0;
 	int z2 = 0;
 
+	uint32_t sprite_id = 0;
+
 	std::string text;
 	wxColor color = wxColor(255, 255, 255, 255);
 };