restore WorldBuilderMapLoader handling of map names

Author: ilteroi

CvGameCoreDLL_Expansion2/CvWorldBuilderMapLoader.cpp

@@ -1288,8 +1288,12 @@ bool CvWorldBuilderMapLoader::Save(const wchar_t* wszFilename, const char* szMap
 	// Set map name
 	if(szMapName == NULL)
 	{
-		//todo: extract file name from path (wszFilename)
-		sg_kSave.m_sMapName = "unknown_map";
+		FStringFixedBufferW(sFilename, MAX_PATH);
+		FStringFixedBufferW(sFileTitle, MAX_PATH);
+
+		sFilename = wszFilename;
+		sFilename.ExtractFileTitle(sFileTitle);
+		sFileTitle.CopyToUTF8(&sg_kSave.m_sMapName);
 	}
 	else
 	{

CvWorldBuilderMap/include/CvWorldBuilderMap.h

@@ -21,6 +21,7 @@
 #include "CvWorldBuilderMapModData.h"
 #include "CvWorldBuilderMapTypeGroup.h"
 #include "FireWorks/FUncopyable.h"
+#include "FString.h"
 
 class FIFile;
 class CvWorldBuilderMapTypeDesc;
@@ -704,8 +705,8 @@ class CvWorldBuilderMap : FUncopyable
 
 	CvWorldBuilderMapModData m_kModData;
 
-	CvString m_sMapName;
-	CvString m_sMapDescription;
+	FString m_sMapName;
+	FString m_sMapDescription;
 
 	CvWorldBuilderMapTypeGroup m_kVictoryTypes;
 	CvWorldBuilderMapTypeGroup m_kGameOptions;