Merge pull request #514 from derouinw/master

Implement favicon for 1.7.2

src/Server.cpp

@@ -203,6 +203,11 @@ bool cServer::InitServer(cIniFile & a_SettingsIni)
 	m_PlayerCount = 0;
 	m_PlayerCountDiff = 0;
 
+	if (cFile::Exists("favicon.png"))
+	{
+		m_FaviconData = Base64Encode(cFile::ReadWholeFile("favicon.png"));
+	}
+
 	if (m_bIsConnected)
 	{
 		LOGERROR("ERROR: Trying to initialize server while server is already running!");
@@ -289,6 +294,15 @@ int cServer::GetNumPlayers(void)
 
 
 
+const AString & cServer::GetFaviconData(void) const
+{
+	return m_FaviconData;
+}
+
+
+
+
+
 void cServer::PrepareKeys(void)
 {
 	// TODO: Save and load key for persistence across sessions