- centralized finding map files and validation of map files. a New report at game start shows a list of invalid maps which will be ignored

- headless server now shows GUI messages in console
- made 'blocked player' button font smaller

source/shared_lib/include/map/map_preview.h

@@ -15,12 +15,14 @@
 #include "util.h"
 #include "types.h"
 #include "randomgen.h"
+#include "vec.h"
 #include <vector>
 
 using Shared::Platform::int8;
 using Shared::Platform::int32;
 using Shared::Platform::float32;
 using Shared::Util::RandomGen;
+using Shared::Graphics::Vec2i;
 
 namespace Shared { namespace Map {
 
@@ -58,7 +60,14 @@ static const int DEFAULT_MAP_CELL_HEIGHT_FACTOR		= 3;
 static const int DEFAULT_MAP_WATER_DEPTH			= 4;
 static const int DEFAULT_CLIFF_HEIGHT				= 0;
 
-static const int MAP_FORMAT_VERSION=2;
+enum MapVersionType {
+	mapver_1 = 1,
+	mapver_2,
+
+	mapver_MAX
+};
+
+static const int MAP_FORMAT_VERSION = mapver_MAX - 1;
 
 struct MapFileHeader {
 	int32 version;
@@ -81,6 +90,20 @@ struct MapFileHeader {
 	};
 };
 
+class MapInfo {
+public:
+
+	Vec2i size;
+	int players;
+	string desc;
+
+	MapInfo() {
+		size 	= Vec2i(0,0);
+		players = 0;
+		desc 	= "";
+	}
+};
+
 // ===============================================
 //	class Map
 // ===============================================
@@ -189,6 +212,12 @@ public:
 
 	bool hasFileLoaded() const {return fileLoaded;}
 	string getMapFileLoaded() const { return mapFileLoaded; }
+
+	static bool loadMapInfo(string file, MapInfo *mapInfo, string i18nMaxMapPlayersTitle,string i18nMapSizeTitle,bool errorOnInvalidMap=true);
+	static string getMapPath(const vector<string> &pathList, const string &mapName, string scenarioDir="", bool errorOnNotFound=true);
+	static vector<string> findAllValidMaps(const vector<string> &pathList,
+			string scenarioDir, bool getUserDataOnly=false, bool cutExtension=true,
+			vector<string> *invalidMapList=NULL);
 };
 
 }}// end namespace