From 44858020d51c48c2f6efd62c88ca610a493ae28e Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 13 Jul 2021 20:28:51 +0000
Subject: [PATCH] Minor improvement for mini events (by rftr): town names are
 provided by the game for lua

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9142 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/MiniEvents.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Strategic/MiniEvents.cpp b/Strategic/MiniEvents.cpp
index c0553cdbd..5afbd17d8 100644
--- a/Strategic/MiniEvents.cpp
+++ b/Strategic/MiniEvents.cpp
@@ -41,6 +41,7 @@ to call into.
 #include "strategicmap.h"
 #include "Strategic Movement.h"
 #include "Strategic Town Loyalty.h"
+#include "Text.h"
 #include "Town Militia.h"
 #include "Vehicles.h"
 #endif
@@ -58,7 +59,7 @@ extern "C" {
 
 extern CHAR16 gzUserDefinedButton1[ 128 ];
 extern CHAR16 gzUserDefinedButton2[ 128 ];
-extern GROUP *gpGroupList;
+extern CHAR16 pTownNames[MAX_TOWNS][MAX_TOWN_NAME_LENGHT];
 
 static size_t MAX_BUTTON_LENGTH = 60;
 static size_t MAX_BODY_LENGTH = 450;
@@ -1183,9 +1184,12 @@ namespace MiniEventHelpers
 		const INT16 y = lua_tointeger(LS, 2);
 
 		const UINT8 townId = GetTownIdForSector(x, y);
+		CHAR8 townName[MAX_TOWN_NAME_LENGHT];
+		sprintf( townName, "%ls", pTownNames[townId] );
 
 		lua_pushinteger(LS, townId);
-		return 1;
+		lua_pushstring( LS, townName );
+		return 2;
 	}
 
 	static int l_SendMercOnMiniEvent(lua_State* LS)