Merge 9cd2f561e3 into 8d431f8feb

2024-09-19 17:14:18 +00:00 · 2024-09-12 16:51:59 +02:00
26 changed files with 521 additions and 433 deletions
--- a/scripts/check_config_variables.py
+++ b/scripts/check_config_variables.py
@ -17,7 +17,7 @@ def parse_config_variables(lines):
 	return matches

 def generate_regex(variable_code):
-	return fr'(g_Config\.m_{variable_code}\b|Config\(\)->m_{variable_code}\b|m_pConfig->m_{variable_code}\b)'
+	return fr'(g_Config\.m_{variable_code}|Config\(\)->m_{variable_code}|m_pConfig->m_{variable_code})'

 def find_config_variables(config_variables):
 	"""Returns the config variables which were not found."""
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@ -762,8 +762,6 @@ void CClient::DummyDisconnect(const char *pReason)
 	m_aReceivedSnapshots[1] = 0;
 	m_DummyConnected = false;
 	m_DummyConnecting = false;
-	m_DummyReconnectOnReload = false;
-	m_DummyDeactivateOnReconnect = false;
 	GameClient()->OnDummyDisconnect();
 }

@ -1522,7 +1520,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				}
 			}

-			if(m_DummyConnected && !m_DummyReconnectOnReload)
+			if(m_DummyConnected)
 			{
 				DummyDisconnect(0);
 			}
@ -1651,25 +1649,9 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 				}
 			}
 		}
-		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_MAP_RELOAD)
-		{
-			if(m_DummyConnected)
-			{
-				m_DummyReconnectOnReload = true;
-				m_DummyDeactivateOnReconnect = g_Config.m_ClDummy == 0;
-				g_Config.m_ClDummy = 0;
-			}
-			else
-				m_DummyDeactivateOnReconnect = false;
-		}
 		else if(Conn == CONN_MAIN && (pPacket->m_Flags & NET_CHUNKFLAG_VITAL) != 0 && Msg == NETMSG_CON_READY)
 		{
 			GameClient()->OnConnected();
-			if(m_DummyReconnectOnReload)
-			{
-				m_DummySendConnInfo = true;
-				m_DummyReconnectOnReload = false;
-			}
 		}
 		else if(Conn == CONN_DUMMY && Msg == NETMSG_CON_READY)
 		{
@ -1677,7 +1659,7 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket, int Conn, bool Dummy)
 			m_DummyConnecting = false;
 			g_Config.m_ClDummy = 1;
 			Rcon("crashmeplx");
-			if(m_aRconAuthed[0] && !m_aRconAuthed[1])
+			if(m_aRconAuthed[0])
 				RconAuth(m_aRconUsername, m_aRconPassword);
 		}
 		else if(Msg == NETMSG_PING)
@ -2764,16 +2746,6 @@ void CClient::Update()
 			}
 		}

-		if(m_DummyDeactivateOnReconnect && g_Config.m_ClDummy == 1)
-		{
-			m_DummyDeactivateOnReconnect = false;
-			g_Config.m_ClDummy = 0;
-		}
-		else if(!m_DummyConnected && m_DummyDeactivateOnReconnect)
-		{
-			m_DummyDeactivateOnReconnect = false;
-		}
-
 		m_LastDummy = (bool)g_Config.m_ClDummy;
 	}

--- a/src/engine/client/client.h
+++ b/src/engine/client/client.h
@ -182,8 +182,6 @@ class CClient : public IClient, public CDemoPlayer::IListener
 	bool m_DummyConnecting = false;
 	bool m_DummyConnected = false;
 	float m_LastDummyConnectTime = 0.0f;
-	bool m_DummyReconnectOnReload = false;
-	bool m_DummyDeactivateOnReconnect = false;

 	// graphs
 	CGraph m_InputtimeMarginGraph;
--- a/src/engine/client/serverbrowser_http.cpp
+++ b/src/engine/client/serverbrowser_http.cpp
@ -424,10 +424,7 @@ void CServerBrowserHttp::Refresh()
 }
 bool ServerbrowserParseUrl(NETADDR *pOut, const char *pUrl)
 {
-	int Failure = net_addr_from_url(pOut, pUrl, nullptr, 0);
-	if(Failure || pOut->port == 0)
-		return true;
-	return false;
+	return net_addr_from_url(pOut, pUrl, nullptr, 0) != 0;
 }
 bool CServerBrowserHttp::Validate(json_value *pJson)
 {
--- a/src/engine/server/databases/connection.h
+++ b/src/engine/server/databases/connection.h
@ -61,7 +61,6 @@ public:
 	virtual void BindInt(int Idx, int Value) = 0;
 	virtual void BindInt64(int Idx, int64_t Value) = 0;
 	virtual void BindFloat(int Idx, float Value) = 0;
-	virtual void BindNull(int Idx) = 0;

 	// Print expanded sql statement
 	virtual void Print() = 0;
--- a/src/engine/server/databases/mysql.cpp
+++ b/src/engine/server/databases/mysql.cpp
@ -89,7 +89,6 @@ public:
 	void BindInt(int Idx, int Value) override;
 	void BindInt64(int Idx, int64_t Value) override;
 	void BindFloat(int Idx, float Value) override;
-	void BindNull(int Idx) override;

 	void Print() override {}
 	bool Step(bool *pEnd, char *pError, int ErrorSize) override;
@ -422,22 +421,6 @@ void CMysqlConnection::BindFloat(int Idx, float Value)
 	pParam->error = nullptr;
 }

-void CMysqlConnection::BindNull(int Idx)
-{
-	m_NewQuery = true;
-	Idx -= 1;
-	dbg_assert(0 <= Idx && Idx < (int)m_vStmtParameters.size(), "index out of bounds");
-
-	MYSQL_BIND *pParam = &m_vStmtParameters[Idx];
-	pParam->buffer_type = MYSQL_TYPE_NULL;
-	pParam->buffer = nullptr;
-	pParam->buffer_length = 0;
-	pParam->length = nullptr;
-	pParam->is_null = nullptr;
-	pParam->is_unsigned = false;
-	pParam->error = nullptr;
-}
-
 bool CMysqlConnection::Step(bool *pEnd, char *pError, int ErrorSize)
 {
 	if(m_NewQuery)
--- a/src/engine/server/databases/sqlite.cpp
+++ b/src/engine/server/databases/sqlite.cpp
@ -37,7 +37,6 @@ public:
 	void BindInt(int Idx, int Value) override;
 	void BindInt64(int Idx, int64_t Value) override;
 	void BindFloat(int Idx, float Value) override;
-	void BindNull(int Idx) override;

 	void Print() override;
 	bool Step(bool *pEnd, char *pError, int ErrorSize) override;
@ -242,13 +241,6 @@ void CSqliteConnection::BindFloat(int Idx, float Value)
 	m_Done = false;
 }

-void CSqliteConnection::BindNull(int Idx)
-{
-	int Result = sqlite3_bind_null(m_pStmt, Idx);
-	AssertNoError(Result);
-	m_Done = false;
-}
-
 // Keep support for SQLite < 3.14 on older Linux distributions. MinGW does not
 // support __attribute__((weak)): https://sourceware.org/bugzilla/show_bug.cgi?id=9687
 #if defined(__GNUC__) && !defined(__MINGW32__)
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@ -243,7 +243,6 @@ CServer::CServer()
 	}

 	m_MapReload = false;
-	m_SameMapReload = false;
 	m_ReloadedWhenEmpty = false;
 	m_aCurrentMap[0] = '\0';

@ -1270,12 +1269,6 @@ void CServer::SendMapData(int ClientId, int Chunk)
 	}
 }

-void CServer::SendMapReload(int ClientId)
-{
-	CMsgPacker Msg(NETMSG_MAP_RELOAD, true);
-	SendMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientId);
-}
-
 void CServer::SendConnectionReady(int ClientId)
 {
 	CMsgPacker Msg(NETMSG_CON_READY, true);
@ -2560,13 +2553,12 @@ void CServer::ChangeMap(const char *pMap)

 void CServer::ReloadMap()
 {
-	m_SameMapReload = true;
+	m_MapReload = true;
 }

 int CServer::LoadMap(const char *pMapName)
 {
 	m_MapReload = false;
-	m_SameMapReload = false;

 	char aBuf[IO_MAX_PATH_LENGTH];
 	str_format(aBuf, sizeof(aBuf), "maps/%s.map", pMapName);
@ -2813,9 +2805,8 @@ int CServer::Run()
 			int NewTicks = 0;

 			// load new map
-			if(m_MapReload || m_SameMapReload || m_CurrentGameTick >= MAX_TICK) // force reload to make sure the ticks stay within a valid range
+			if(m_MapReload || m_CurrentGameTick >= MAX_TICK) // force reload to make sure the ticks stay within a valid range
 			{
-				const bool SameMapReload = m_SameMapReload;
 				// load map
 				if(LoadMap(Config()->m_SvMap))
 				{
@ -2840,9 +2831,6 @@ int CServer::Run()
 						if(m_aClients[ClientId].m_State <= CClient::STATE_AUTH)
 							continue;

-						if(SameMapReload)
-							SendMapReload(ClientId);
-
 						SendMap(ClientId);
 						bool HasPersistentData = m_aClients[ClientId].m_HasPersistentData;
 						m_aClients[ClientId].Reset();
@ -3521,7 +3509,7 @@ void CServer::ConStopRecord(IConsole::IResult *pResult, void *pUser)

 void CServer::ConMapReload(IConsole::IResult *pResult, void *pUser)
 {
-	((CServer *)pUser)->ReloadMap();
+	((CServer *)pUser)->m_MapReload = true;
 }

 void CServer::ConLogout(IConsole::IResult *pResult, void *pUser)
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@ -219,7 +219,6 @@ public:
 	int m_RunServer;

 	bool m_MapReload;
-	bool m_SameMapReload;
 	bool m_ReloadedWhenEmpty;
 	int m_RconClientId;
 	int m_RconAuthLevel;
@ -325,7 +324,6 @@ public:
 	void SendCapabilities(int ClientId);
 	void SendMap(int ClientId);
 	void SendMapData(int ClientId, int Chunk);
-	void SendMapReload(int ClientId);
 	void SendConnectionReady(int ClientId);
 	void SendRconLine(int ClientId, const char *pLine);
 	// Accepts -1 as ClientId to mean "all clients with at least auth level admin"
--- a/src/engine/shared/protocol_ex_msgs.h
+++ b/src/engine/shared/protocol_ex_msgs.h
@ -35,4 +35,3 @@ UUID(NETMSG_CHECKSUM_ERROR, "checksum-error@ddnet.tw")
 UUID(NETMSG_REDIRECT, "redirect@ddnet.org")
 UUID(NETMSG_RCON_CMD_GROUP_START, "rcon-cmd-group-start@ddnet.org")
 UUID(NETMSG_RCON_CMD_GROUP_END, "rcon-cmd-group-end@ddnet.org")
-UUID(NETMSG_MAP_RELOAD, "map-reload@ddnet.org")
--- a/src/game/client/components/chat.cpp
+++ b/src/game/client/components/chat.cpp
@ -805,9 +805,50 @@ void CChat::AddLine(int ClientId, int Team, const char *pLine)
 		{
 			if(!g_Config.m_ClChatOld)
 			{
+				pCurrentLine->m_CustomColoredSkin = LineAuthor.m_RenderInfo.m_CustomColoredSkin;
+				if(pCurrentLine->m_CustomColoredSkin)
+					pCurrentLine->m_RenderSkin = LineAuthor.m_RenderInfo.m_ColorableRenderSkin;
+				else
+					pCurrentLine->m_RenderSkin = LineAuthor.m_RenderInfo.m_OriginalRenderSkin;
+
 				str_copy(pCurrentLine->m_aSkinName, LineAuthor.m_aSkinName);
-				pCurrentLine->m_TeeRenderInfo = LineAuthor.m_RenderInfo;
+				pCurrentLine->m_ColorBody = LineAuthor.m_RenderInfo.m_ColorBody;
+				pCurrentLine->m_ColorFeet = LineAuthor.m_RenderInfo.m_ColorFeet;
+
+				pCurrentLine->m_RenderSkinMetrics = LineAuthor.m_RenderInfo.m_SkinMetrics;
 				pCurrentLine->m_HasRenderTee = true;
+
+				// 0.7
+				if(Client()->IsSixup())
+				{
+					for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+					{
+						const char *pPartName = LineAuthor.m_aSixup[g_Config.m_ClDummy].m_aaSkinPartNames[Part];
+						int Id = m_pClient->m_Skins7.FindSkinPart(Part, pPartName, false);
+						const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, Id);
+						if(LineAuthor.m_aSixup[g_Config.m_ClDummy].m_aUseCustomColors[Part])
+						{
+							pCurrentLine->m_Sixup.m_aTextures[Part] = pSkinPart->m_ColorTexture;
+							pCurrentLine->m_Sixup.m_aColors[Part] = m_pClient->m_Skins7.GetColor(
+								LineAuthor.m_aSixup[g_Config.m_ClDummy].m_aSkinPartColors[Part],
+								Part == protocol7::SKINPART_MARKING);
+						}
+						else
+						{
+							pCurrentLine->m_Sixup.m_aTextures[Part] = pSkinPart->m_OrgTexture;
+							pCurrentLine->m_Sixup.m_aColors[Part] = vec4(1.0f, 1.0f, 1.0f, 1.0f);
+						}
+
+						if(LineAuthor.m_SkinInfo.m_aSixup[g_Config.m_ClDummy].m_HatTexture.IsValid())
+						{
+							if(Part == protocol7::SKINPART_BODY && str_comp(pPartName, "standard"))
+								pCurrentLine->m_Sixup.m_HatSpriteIndex = CSkins7::HAT_OFFSET_SIDE + (ClientId % CSkins7::HAT_NUM);
+							if(Part == protocol7::SKINPART_DECORATION && str_comp(pPartName, "twinbopp"))
+								pCurrentLine->m_Sixup.m_HatSpriteIndex = CSkins7::HAT_OFFSET_SIDE + (ClientId % CSkins7::HAT_NUM);
+							pCurrentLine->m_Sixup.m_HatTexture = LineAuthor.m_SkinInfo.m_aSixup[g_Config.m_ClDummy].m_HatTexture;
+						}
+					}
+				}
 			}
 		}
 	}
@ -876,11 +917,17 @@ void CChat::OnRefreshSkins()
 	{
 		if(Line.m_HasRenderTee)
 		{
-			Line.m_TeeRenderInfo.Apply(m_pClient->m_Skins.Find(Line.m_aSkinName));
+			const CSkin *pSkin = m_pClient->m_Skins.Find(Line.m_aSkinName);
+			if(Line.m_CustomColoredSkin)
+				Line.m_RenderSkin = pSkin->m_ColorableSkin;
+			else
+				Line.m_RenderSkin = pSkin->m_OriginalSkin;
+
+			Line.m_RenderSkinMetrics = pSkin->m_Metrics;
 		}
 		else
 		{
-			Line.m_TeeRenderInfo.Reset();
+			Line.m_RenderSkin.Reset();
 		}
 	}
 }
@ -1244,7 +1291,28 @@ void CChat::OnRender()
 			if(!g_Config.m_ClChatOld && Line.m_HasRenderTee)
 			{
 				const int TeeSize = MessageTeeSize();
-				Line.m_TeeRenderInfo.m_Size = TeeSize;
+				CTeeRenderInfo RenderInfo;
+				RenderInfo.m_CustomColoredSkin = Line.m_CustomColoredSkin;
+				if(Line.m_CustomColoredSkin)
+					RenderInfo.m_ColorableRenderSkin = Line.m_RenderSkin;
+				else
+					RenderInfo.m_OriginalRenderSkin = Line.m_RenderSkin;
+				RenderInfo.m_SkinMetrics = Line.m_RenderSkinMetrics;
+
+				RenderInfo.m_ColorBody = Line.m_ColorBody;
+				RenderInfo.m_ColorFeet = Line.m_ColorFeet;
+				RenderInfo.m_Size = TeeSize;
+
+				if(Client()->IsSixup())
+				{
+					for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+					{
+						RenderInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = Line.m_Sixup.m_aColors[Part];
+						RenderInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = Line.m_Sixup.m_aTextures[Part];
+						RenderInfo.m_aSixup[g_Config.m_ClDummy].m_HatSpriteIndex = Line.m_Sixup.m_HatSpriteIndex;
+						RenderInfo.m_aSixup[g_Config.m_ClDummy].m_HatTexture = Line.m_Sixup.m_HatTexture;
+					}
+				}

 				float RowHeight = FontSize() + RealMsgPaddingY;
 				float OffsetTeeY = TeeSize / 2.0f;
@ -1252,9 +1320,9 @@ void CChat::OnRender()

 				const CAnimState *pIdleState = CAnimState::GetIdle();
 				vec2 OffsetToMid;
-				CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &Line.m_TeeRenderInfo, OffsetToMid);
+				CRenderTools::GetRenderTeeOffsetToRenderedTee(pIdleState, &RenderInfo, OffsetToMid);
 				vec2 TeeRenderPos(x + (RealMsgPaddingX + TeeSize) / 2.0f, y + OffsetTeeY + FullHeightMinusTee / 2.0f + OffsetToMid.y);
-				RenderTools()->RenderTee(pIdleState, &Line.m_TeeRenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), TeeRenderPos, Blend);
+				RenderTools()->RenderTee(pIdleState, &RenderInfo, EMOTE_NORMAL, vec2(1, 0.1f), TeeRenderPos, Blend);
 			}

 			const ColorRGBA TextColor = TextRender()->DefaultTextColor().WithMultipliedAlpha(Blend);
--- a/src/game/client/components/chat.h
+++ b/src/game/client/components/chat.h
@ -11,7 +11,6 @@

 #include <game/client/component.h>
 #include <game/client/lineinput.h>
-#include <game/client/render.h>
 #include <game/client/skin.h>
 #include <game/generated/protocol7.h>

@ -46,12 +45,30 @@ class CChat : public CComponent
 		int m_QuadContainerIndex;

 		char m_aSkinName[std::size(g_Config.m_ClPlayerSkin)];
-		bool m_HasRenderTee;
-		CTeeRenderInfo m_TeeRenderInfo;
+		CSkin::SSkinTextures m_RenderSkin;
+		CSkin::SSkinMetrics m_RenderSkinMetrics;
+		bool m_CustomColoredSkin;
+		ColorRGBA m_ColorBody;
+		ColorRGBA m_ColorFeet;

+		bool m_HasRenderTee;
 		float m_TextYOffset;

 		int m_TimesRepeated;
+
+		class CSixup
+		{
+		public:
+			IGraphics::CTextureHandle m_aTextures[protocol7::NUM_SKINPARTS];
+			IGraphics::CTextureHandle m_HatTexture;
+			IGraphics::CTextureHandle m_BotTexture;
+			int m_HatSpriteIndex;
+			ColorRGBA m_BotColor;
+			ColorRGBA m_aColors[protocol7::NUM_SKINPARTS];
+		};
+
+		// 0.7 Skin
+		CSixup m_Sixup;
 	};

 	bool m_PrevScoreBoardShowed;
--- a/src/game/client/components/ghost.cpp
+++ b/src/game/client/components/ghost.cpp
@ -366,7 +366,10 @@ void CGhost::OnRender()
 					IsTeamplay = (m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS) != 0;

 				GhostNinjaRenderInfo = Ghost.m_RenderInfo;
-				GhostNinjaRenderInfo.Apply(pSkin);
+				GhostNinjaRenderInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+				GhostNinjaRenderInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+				GhostNinjaRenderInfo.m_BloodColor = pSkin->m_BloodColor;
+				GhostNinjaRenderInfo.m_SkinMetrics = pSkin->m_Metrics;
 				GhostNinjaRenderInfo.m_CustomColoredSkin = IsTeamplay;
 				if(!IsTeamplay)
 				{
@ -389,7 +392,11 @@ void CGhost::InitRenderInfos(CGhostItem *pGhost)
 	IntsToStr(&pGhost->m_Skin.m_Skin0, 6, aSkinName, std::size(aSkinName));
 	CTeeRenderInfo *pRenderInfo = &pGhost->m_RenderInfo;

-	pRenderInfo->Apply(m_pClient->m_Skins.Find(aSkinName));
+	const CSkin *pSkin = m_pClient->m_Skins.Find(aSkinName);
+	pRenderInfo->m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	pRenderInfo->m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	pRenderInfo->m_BloodColor = pSkin->m_BloodColor;
+	pRenderInfo->m_SkinMetrics = pSkin->m_Metrics;
 	pRenderInfo->m_CustomColoredSkin = pGhost->m_Skin.m_UseCustomColor;
 	if(pGhost->m_Skin.m_UseCustomColor)
 	{
@ -690,7 +697,11 @@ void CGhost::OnRefreshSkins()
 		CTeeRenderInfo *pRenderInfo = &Ghost.m_RenderInfo;
 		if(aSkinName[0] != '\0')
 		{
-			pRenderInfo->Apply(m_pClient->m_Skins.Find(aSkinName));
+			const CSkin *pSkin = m_pClient->m_Skins.Find(aSkinName);
+			pRenderInfo->m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+			pRenderInfo->m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+			pRenderInfo->m_BloodColor = pSkin->m_BloodColor;
+			pRenderInfo->m_SkinMetrics = pSkin->m_Metrics;
 		}
 		else
 		{
--- a/src/game/client/components/menus.h
+++ b/src/game/client/components/menus.h
@ -248,7 +248,6 @@ protected:
 	int m_SettingPlayerPage;

 	// 0.7 skins
-	bool m_CustomSkinMenu = false;
 	int m_TeePartSelected = protocol7::SKINPART_BODY;
 	const CSkins7::CSkin *m_pSelectedSkin = nullptr;
 	CLineInputBuffered<protocol7::MAX_SKIN_ARRAY_SIZE, protocol7::MAX_SKIN_LENGTH> m_SkinNameInput;
@ -597,6 +596,7 @@ protected:
 	void RenderSettingsTee(CUIRect MainView);
 	void RenderSettingsTee7(CUIRect MainView);
 	void RenderSettingsTeeCustom7(CUIRect MainView);
+	void RenderSettingsTeeBasic7(CUIRect MainView);
 	void RenderSkinSelection7(CUIRect MainView);
 	void RenderSkinPartSelection7(CUIRect MainView);
 	void RenderSettingsControls(CUIRect MainView);
--- a/src/game/client/components/menus_browser.cpp
+++ b/src/game/client/components/menus_browser.cpp
@ -1822,8 +1822,12 @@ bool CMenus::PrintHighlighted(const char *pName, F &&PrintFn)

 CTeeRenderInfo CMenus::GetTeeRenderInfo(vec2 Size, const char *pSkinName, bool CustomSkinColors, int CustomSkinColorBody, int CustomSkinColorFeet) const
 {
+	const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
+
 	CTeeRenderInfo TeeInfo;
-	TeeInfo.Apply(m_pClient->m_Skins.Find(pSkinName));
+	TeeInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	TeeInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	TeeInfo.m_SkinMetrics = pSkin->m_Metrics;
 	TeeInfo.m_CustomColoredSkin = CustomSkinColors;
 	if(CustomSkinColors)
 	{
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@ -633,8 +633,11 @@ void CMenus::RenderSettingsTee(CUIRect MainView)

 	// Note: get the skin info after the settings buttons, because they can trigger a refresh
 	// which invalidates the skin.
+	const CSkin *pSkin = m_pClient->m_Skins.Find(pSkinName);
 	CTeeRenderInfo OwnSkinInfo;
-	OwnSkinInfo.Apply(m_pClient->m_Skins.Find(pSkinName));
+	OwnSkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	OwnSkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	OwnSkinInfo.m_SkinMetrics = pSkin->m_Metrics;
 	OwnSkinInfo.m_CustomColoredSkin = *pUseCustomColor;
 	if(*pUseCustomColor)
 	{
--- a/src/game/client/components/menus_settings7.cpp
+++ b/src/game/client/components/menus_settings7.cpp
@ -31,62 +31,246 @@

 #include <vector>

-using namespace FontIcons;
-
 void CMenus::RenderSettingsTee7(CUIRect MainView)
 {
-	CUIRect SkinPreview, NormalSkinPreview, RedTeamSkinPreview, BlueTeamSkinPreview, Buttons, QuickSearch, DirectoryButton, RefreshButton, SaveDeleteButton, TabBars, TabBar, LeftTab, RightTab;
-	MainView.HSplitBottom(20.0f, &MainView, &Buttons);
-	MainView.HSplitBottom(5.0f, &MainView, nullptr);
-	Buttons.VSplitRight(25.0f, &Buttons, &RefreshButton);
-	Buttons.VSplitRight(10.0f, &Buttons, nullptr);
-	Buttons.VSplitRight(140.0f, &Buttons, &DirectoryButton);
-	Buttons.VSplitLeft(220.0f, &QuickSearch, &Buttons);
-	Buttons.VSplitLeft(10.0f, nullptr, &Buttons);
-	Buttons.VSplitLeft(120.0f, &SaveDeleteButton, &Buttons);
-	MainView.HSplitTop(50.0f, &TabBars, &MainView);
-	MainView.HSplitTop(10.0f, nullptr, &MainView);
-	TabBars.VSplitMid(&TabBars, &SkinPreview, 20.0f);
+	static bool s_CustomSkinMenu = false;
+	// static int s_PlayerCountry = 0;
+	// static char s_aPlayerName[64] = {0};
+	// static char s_aPlayerClan[64] = {0};

-	TabBars.HSplitTop(20.0f, &TabBar, &TabBars);
-	TabBar.VSplitMid(&LeftTab, &RightTab);
-	TabBars.HSplitTop(10.0f, nullptr, &TabBars);
+	// if(m_pClient->m_IdentityState < 0)
+	// {
+	// 	s_PlayerCountry = Config()->m_PlayerCountry;
+	// 	str_copy(s_aPlayerName, Config()->m_PlayerName, sizeof(s_aPlayerName));
+	// 	str_copy(s_aPlayerClan, Config()->m_PlayerClan, sizeof(s_aPlayerClan));
+	// 	m_pClient->m_IdentityState = 0;
+	// }

-	SkinPreview.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f), IGraphics::CORNER_ALL, 5.0f);
-	SkinPreview.VMargin(10.0f, &SkinPreview);
-	SkinPreview.VSplitRight(50.0f, &SkinPreview, &BlueTeamSkinPreview);
-	SkinPreview.VSplitRight(10.0f, &SkinPreview, nullptr);
-	SkinPreview.VSplitRight(50.0f, &SkinPreview, &RedTeamSkinPreview);
-	SkinPreview.VSplitRight(10.0f, &SkinPreview, nullptr);
-	SkinPreview.VSplitRight(50.0f, &SkinPreview, &NormalSkinPreview);
-	SkinPreview.VSplitRight(10.0f, &SkinPreview, nullptr);
+	CUIRect Label, TopView, BottomView, Left, Right;

-	static CButtonContainer s_PlayerTabButton;
-	if(DoButton_MenuTab(&s_PlayerTabButton, Localize("Player"), !m_Dummy, &LeftTab, IGraphics::CORNER_L, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	// cut view
+	MainView.HSplitBottom(40.0f, &MainView, &BottomView);
+	BottomView.HSplitTop(20.f, 0, &BottomView);
+
+	CUIRect QuickSearch, DirectoryButton, Buttons;
+	CUIRect ButtonLeft, ButtonMiddle, ButtonRight;
+
+	BottomView.VSplitMid(&QuickSearch, &Buttons, 10.0f);
+	QuickSearch.VSplitLeft(240.0f, &QuickSearch, &DirectoryButton);
+	QuickSearch.VSplitRight(10.0f, &QuickSearch, nullptr);
+
+	const float ButtonSize = Buttons.w / 3;
+	Buttons.VSplitLeft(ButtonSize, &ButtonLeft, &Buttons);
+	Buttons.VSplitLeft(ButtonSize, &ButtonMiddle, &Buttons);
+	Buttons.VSplitLeft(ButtonSize, &ButtonRight, &Buttons);
+
+	// render skin preview background
+	const float SpacingH = 2.0f;
+	const float SpacingW = 3.0f;
+	const float ButtonHeight = 20.0f;
+	const float SkinHeight = 50.0f;
+	const float BackgroundHeight = (ButtonHeight + SpacingH) + SkinHeight * 2;
+
+	MainView.HSplitTop(20.0f, 0, &MainView);
+	MainView.HSplitTop(BackgroundHeight, &TopView, &MainView);
+	TopView.VSplitMid(&Left, &Right, 3.0f);
+	Left.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);
+	Right.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);
+
+	Left.HSplitTop(ButtonHeight, &Label, &Left);
+	Ui()->DoLabel(&Label, Localize("Tee"), ButtonHeight * CUi::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+
+	// Preview
 	{
-		m_Dummy = false;
+		CUIRect Top, Bottom, TeeLeft, TeeRight;
+
+		Left.HSplitTop(SpacingH, 0, &Left);
+		Left.HSplitTop(SkinHeight * 2, &Top, &Left);
+
+		// split the menu in 2 parts
+		Top.HSplitMid(&Top, &Bottom, SpacingH);
+
+		// handle left
+
+		// validate skin parts for solo mode
+		CTeeRenderInfo OwnSkinInfo;
+		OwnSkinInfo.m_Size = 50.0f;
+
+		char aSkinParts[protocol7::NUM_SKINPARTS][protocol7::MAX_SKIN_ARRAY_SIZE];
+		char *apSkinPartsPtr[protocol7::NUM_SKINPARTS];
+		int aUCCVars[protocol7::NUM_SKINPARTS];
+		int aColorVars[protocol7::NUM_SKINPARTS];
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			str_copy(aSkinParts[Part], CSkins7::ms_apSkinVariables[(int)m_Dummy][Part], protocol7::MAX_SKIN_ARRAY_SIZE);
+			apSkinPartsPtr[Part] = aSkinParts[Part];
+			aUCCVars[Part] = *CSkins7::ms_apUCCVariables[(int)m_Dummy][Part];
+			aColorVars[Part] = *CSkins7::ms_apColorVariables[(int)m_Dummy][Part];
+		}
+
+		m_pClient->m_Skins7.ValidateSkinParts(apSkinPartsPtr, aUCCVars, aColorVars, 0);
+
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			int SkinPart = m_pClient->m_Skins7.FindSkinPart(Part, apSkinPartsPtr[Part], false);
+			const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, SkinPart);
+			if(aUCCVars[Part])
+			{
+				OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_ColorTexture;
+				OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(aColorVars[Part], Part == protocol7::SKINPART_MARKING);
+			}
+			else
+			{
+				OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_OrgTexture;
+				OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+		}
+
+		// draw preview
+		Top.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);
+
+		Top.VSplitLeft(Top.w / 3.0f + SpacingW / 2.0f, &Label, &Top);
+		Label.y += 17.0f;
+		Ui()->DoLabel(&Label, Localize("Normal:"), ButtonHeight * CUi::ms_FontmodHeight * 0.8f, TEXTALIGN_CENTER);
+
+		Top.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);
+
+		{
+			// interactive tee: tee looking towards cursor, and it is happy when you touch it
+			const vec2 TeePosition = vec2(Top.x + Top.w / 2.0f, Top.y + Top.h / 2.0f + 6.0f);
+			const vec2 DeltaPosition = Ui()->MousePos() - TeePosition;
+			const float Distance = length(DeltaPosition);
+			const float InteractionDistance = 20.0f;
+			const vec2 TeeDirection = Distance < InteractionDistance ? normalize(vec2(DeltaPosition.x, maximum(DeltaPosition.y, 0.5f))) : normalize(DeltaPosition);
+			const int TeeEmote = Distance < InteractionDistance ? EMOTE_HAPPY : EMOTE_NORMAL;
+			RenderTools()->RenderTee(CAnimState::GetIdle(), &OwnSkinInfo, TeeEmote, TeeDirection, TeePosition);
+			static char s_InteractiveTeeButtonId;
+			if(Distance < InteractionDistance && Ui()->DoButtonLogic(&s_InteractiveTeeButtonId, 0, &Top))
+			{
+				m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_PLAYER_SPAWN, 1.0f);
+			}
+		}
+
+		// handle right (team skins)
+
+		// validate skin parts for team game mode
+		CTeeRenderInfo TeamSkinInfo = OwnSkinInfo;
+
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			str_copy(aSkinParts[Part], CSkins7::ms_apSkinVariables[(int)m_Dummy][Part], protocol7::MAX_SKIN_ARRAY_SIZE);
+			apSkinPartsPtr[Part] = aSkinParts[Part];
+			aUCCVars[Part] = *CSkins7::ms_apUCCVariables[(int)m_Dummy][Part];
+			aColorVars[Part] = *CSkins7::ms_apColorVariables[(int)m_Dummy][Part];
+		}
+
+		m_pClient->m_Skins7.ValidateSkinParts(apSkinPartsPtr, aUCCVars, aColorVars, GAMEFLAG_TEAMS);
+
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			int SkinPart = m_pClient->m_Skins7.FindSkinPart(Part, apSkinPartsPtr[Part], false);
+			const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, SkinPart);
+			if(aUCCVars[Part])
+			{
+				TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_ColorTexture;
+				TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(aColorVars[Part], Part == protocol7::SKINPART_MARKING);
+			}
+			else
+			{
+				TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_OrgTexture;
+				TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+			}
+		}
+
+		// draw preview
+		Bottom.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);
+
+		Bottom.VSplitLeft(Bottom.w / 3.0f + SpacingW / 2.0f, &Label, &Bottom);
+		Label.y += 17.0f;
+		Ui()->DoLabel(&Label, Localize("Team:"), ButtonHeight * CUi::ms_FontmodHeight * 0.8f, TEXTALIGN_CENTER);
+
+		Bottom.VSplitMid(&TeeLeft, &TeeRight, SpacingW);
+
+		TeeLeft.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);
+
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			ColorRGBA TeamColor = m_pClient->m_Skins7.GetTeamColor(aUCCVars[Part], aColorVars[Part], TEAM_RED, Part);
+			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = TeamColor;
+		}
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &TeamSkinInfo, 0, vec2(1, 0), vec2(TeeLeft.x + TeeLeft.w / 2.0f, TeeLeft.y + TeeLeft.h / 2.0f + 6.0f));
+
+		TeeRight.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);
+
+		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		{
+			ColorRGBA TeamColor = m_pClient->m_Skins7.GetTeamColor(aUCCVars[Part], aColorVars[Part], TEAM_BLUE, Part);
+			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = TeamColor;
+		}
+		RenderTools()->RenderTee(CAnimState::GetIdle(), &TeamSkinInfo, 0, vec2(-1, 0), vec2(TeeRight.x + TeeRight.w / 2.0f, TeeRight.y + TeeRight.h / 2.0f + 6.0f));
 	}

-	static CButtonContainer s_DummyTabButton;
-	if(DoButton_MenuTab(&s_DummyTabButton, Localize("Dummy"), m_Dummy, &RightTab, IGraphics::CORNER_R, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	Right.HSplitTop(ButtonHeight, &Label, &Right);
+	Ui()->DoLabel(&Label, Localize("Settings"), ButtonHeight * CUi::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+
+	// Settings
 	{
-		m_Dummy = true;
+		CUIRect Top, Bottom, Dummy, DummyLabel;
+		Right.HSplitTop(SpacingH, 0, &Right);
+		Right.HSplitMid(&Top, &Bottom, SpacingH);
+
+		Right.HSplitTop(20.0f, &Dummy, &Right);
+		Dummy.HSplitTop(20.0f, &DummyLabel, &Dummy);
+
+		if(DoButton_CheckBox(&m_Dummy, Localize("Dummy settings"), m_Dummy, &DummyLabel))
+		{
+			m_Dummy ^= 1;
+		}
+		GameClient()->m_Tooltips.DoToolTip(&m_Dummy, &DummyLabel, Localize("Toggle to edit your dummy settings"));
 	}

-	TabBars.HSplitTop(20.0f, &TabBar, &TabBars);
-	TabBar.VSplitMid(&LeftTab, &RightTab);
+	MainView.HSplitTop(10.0f, 0, &MainView);

-	static CButtonContainer s_BasicTabButton;
-	if(DoButton_MenuTab(&s_BasicTabButton, Localize("Basic"), !m_CustomSkinMenu, &LeftTab, IGraphics::CORNER_L, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	if(s_CustomSkinMenu)
+		RenderSettingsTeeCustom7(MainView);
+	else
+		RenderSettingsTeeBasic7(MainView);
+
+	// bottom buttons
+	if(s_CustomSkinMenu)
 	{
-		m_CustomSkinMenu = false;
+		static CButtonContainer s_CustomSkinSaveButton;
+		if(DoButton_Menu(&s_CustomSkinSaveButton, Localize("Save"), 0, &ButtonLeft))
+		{
+			m_Popup = POPUP_SAVE_SKIN;
+			m_SkinNameInput.SelectAll();
+			Ui()->SetActiveItem(&m_SkinNameInput);
+		}
+
+		static CButtonContainer s_RandomizeSkinButton;
+		if(DoButton_Menu(&s_RandomizeSkinButton, Localize("Randomize"), 0, &ButtonMiddle))
+		{
+			m_pClient->m_Skins7.RandomizeSkin(m_Dummy);
+			Config()->m_ClPlayer7Skin[0] = 0;
+			SetNeedSendInfo();
+		}
+	}
+	else if(m_pSelectedSkin && (m_pSelectedSkin->m_Flags & CSkins7::SKINFLAG_STANDARD) == 0)
+	{
+		static CButtonContainer s_CustomSkinDeleteButton;
+		if(DoButton_Menu(&s_CustomSkinDeleteButton, Localize("Delete"), 0, &ButtonMiddle) || Ui()->ConsumeHotkey(CUi::HOTKEY_DELETE))
+		{
+			char aBuf[128];
+			str_format(aBuf, sizeof(aBuf), Localize("Are you sure that you want to delete '%s'?"), m_pSelectedSkin->m_aName);
+			PopupConfirm(Localize("Delete skin"), aBuf, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDeleteSkin7);
+		}
 	}

-	static CButtonContainer s_CustomTabButton;
-	if(DoButton_MenuTab(&s_CustomTabButton, Localize("Custom"), m_CustomSkinMenu, &RightTab, IGraphics::CORNER_R, nullptr, nullptr, nullptr, nullptr, 4.0f))
+	static CButtonContainer s_CustomSwitchButton;
+	if(DoButton_Menu(&s_CustomSwitchButton, s_CustomSkinMenu ? Localize("Basic") : Localize("Custom"), 0, &ButtonRight))
 	{
-		m_CustomSkinMenu = true;
-		if(m_CustomSkinMenu && m_pSelectedSkin)
+		s_CustomSkinMenu = !s_CustomSkinMenu;
+		if(s_CustomSkinMenu && m_pSelectedSkin)
 		{
 			if(m_pSelectedSkin->m_Flags & CSkins7::SKINFLAG_STANDARD)
 			{
@ -98,122 +282,6 @@ void CMenus::RenderSettingsTee7(CUIRect MainView)
 		}
 	}

-	// validate skin parts for solo mode
-	char aSkinParts[protocol7::NUM_SKINPARTS][protocol7::MAX_SKIN_ARRAY_SIZE];
-	char *apSkinPartsPtr[protocol7::NUM_SKINPARTS];
-	int aUCCVars[protocol7::NUM_SKINPARTS];
-	int aColorVars[protocol7::NUM_SKINPARTS];
-	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
-	{
-		str_copy(aSkinParts[Part], CSkins7::ms_apSkinVariables[(int)m_Dummy][Part], protocol7::MAX_SKIN_ARRAY_SIZE);
-		apSkinPartsPtr[Part] = aSkinParts[Part];
-		aUCCVars[Part] = *CSkins7::ms_apUCCVariables[(int)m_Dummy][Part];
-		aColorVars[Part] = *CSkins7::ms_apColorVariables[(int)m_Dummy][Part];
-	}
-	m_pClient->m_Skins7.ValidateSkinParts(apSkinPartsPtr, aUCCVars, aColorVars, 0);
-
-	CTeeRenderInfo OwnSkinInfo;
-	OwnSkinInfo.m_Size = 50.0f;
-	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
-	{
-		int SkinPart = m_pClient->m_Skins7.FindSkinPart(Part, apSkinPartsPtr[Part], false);
-		const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, SkinPart);
-		if(aUCCVars[Part])
-		{
-			OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_ColorTexture;
-			OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(aColorVars[Part], Part == protocol7::SKINPART_MARKING);
-		}
-		else
-		{
-			OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_OrgTexture;
-			OwnSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
-		}
-	}
-
-	char aBuf[128 + IO_MAX_PATH_LENGTH];
-	str_format(aBuf, sizeof(aBuf), "%s:", Localize("Your skin"));
-	Ui()->DoLabel(&SkinPreview, aBuf, 14.0f, TEXTALIGN_ML);
-
-	{
-		// interactive tee: tee looking towards cursor, and it is happy when you touch it
-		const vec2 TeePosition = NormalSkinPreview.Center() + vec2(0.0f, 6.0f);
-		const vec2 DeltaPosition = Ui()->MousePos() - TeePosition;
-		const float Distance = length(DeltaPosition);
-		const float InteractionDistance = 20.0f;
-		const vec2 TeeDirection = Distance < InteractionDistance ? normalize(vec2(DeltaPosition.x, maximum(DeltaPosition.y, 0.5f))) : normalize(DeltaPosition);
-		const int TeeEmote = Distance < InteractionDistance ? EMOTE_HAPPY : EMOTE_NORMAL;
-		RenderTools()->RenderTee(CAnimState::GetIdle(), &OwnSkinInfo, TeeEmote, TeeDirection, TeePosition);
-		static char s_InteractiveTeeButtonId;
-		if(Distance < InteractionDistance && Ui()->DoButtonLogic(&s_InteractiveTeeButtonId, 0, &NormalSkinPreview))
-		{
-			m_pClient->m_Sounds.Play(CSounds::CHN_GUI, SOUND_PLAYER_SPAWN, 1.0f);
-		}
-	}
-
-	// validate skin parts for team game mode
-	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
-	{
-		str_copy(aSkinParts[Part], CSkins7::ms_apSkinVariables[(int)m_Dummy][Part], protocol7::MAX_SKIN_ARRAY_SIZE);
-		apSkinPartsPtr[Part] = aSkinParts[Part];
-		aUCCVars[Part] = *CSkins7::ms_apUCCVariables[(int)m_Dummy][Part];
-		aColorVars[Part] = *CSkins7::ms_apColorVariables[(int)m_Dummy][Part];
-	}
-	m_pClient->m_Skins7.ValidateSkinParts(apSkinPartsPtr, aUCCVars, aColorVars, GAMEFLAG_TEAMS);
-
-	CTeeRenderInfo TeamSkinInfo = OwnSkinInfo;
-	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
-	{
-		int SkinPart = m_pClient->m_Skins7.FindSkinPart(Part, apSkinPartsPtr[Part], false);
-		const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(Part, SkinPart);
-		if(aUCCVars[Part])
-		{
-			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_ColorTexture;
-			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(aColorVars[Part], Part == protocol7::SKINPART_MARKING);
-		}
-		else
-		{
-			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkinPart->m_OrgTexture;
-			TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
-		}
-	}
-
-	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
-	{
-		TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetTeamColor(aUCCVars[Part], aColorVars[Part], TEAM_RED, Part);
-	}
-	RenderTools()->RenderTee(CAnimState::GetIdle(), &TeamSkinInfo, 0, vec2(1, 0), RedTeamSkinPreview.Center() + vec2(0.0f, 6.0f));
-
-	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
-	{
-		TeamSkinInfo.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetTeamColor(aUCCVars[Part], aColorVars[Part], TEAM_BLUE, Part);
-	}
-	RenderTools()->RenderTee(CAnimState::GetIdle(), &TeamSkinInfo, 0, vec2(-1, 0), BlueTeamSkinPreview.Center() + vec2(0.0f, 6.0f));
-
-	if(m_CustomSkinMenu)
-		RenderSettingsTeeCustom7(MainView);
-	else
-		RenderSkinSelection7(MainView);
-
-	if(m_CustomSkinMenu)
-	{
-		static CButtonContainer s_CustomSkinSaveButton;
-		if(DoButton_Menu(&s_CustomSkinSaveButton, Localize("Save"), 0, &SaveDeleteButton))
-		{
-			m_Popup = POPUP_SAVE_SKIN;
-			m_SkinNameInput.SelectAll();
-			Ui()->SetActiveItem(&m_SkinNameInput);
-		}
-	}
-	else if(m_pSelectedSkin && (m_pSelectedSkin->m_Flags & CSkins7::SKINFLAG_STANDARD) == 0)
-	{
-		static CButtonContainer s_CustomSkinDeleteButton;
-		if(DoButton_Menu(&s_CustomSkinDeleteButton, Localize("Delete"), 0, &SaveDeleteButton) || Ui()->ConsumeHotkey(CUi::HOTKEY_DELETE))
-		{
-			str_format(aBuf, sizeof(aBuf), Localize("Are you sure that you want to delete '%s'?"), m_pSelectedSkin->m_aName);
-			PopupConfirm(Localize("Delete skin"), aBuf, Localize("Yes"), Localize("No"), &CMenus::PopupConfirmDeleteSkin7);
-		}
-	}
-
 	static CLineInput s_SkinFilterInput(g_Config.m_ClSkinFilterString, sizeof(g_Config.m_ClSkinFilterString));
 	if(Ui()->DoEditBox_Search(&s_SkinFilterInput, &QuickSearch, 14.0f, !Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed()))
 	{
@ -223,25 +291,12 @@ void CMenus::RenderSettingsTee7(CUIRect MainView)
 	static CButtonContainer s_DirectoryButton;
 	if(DoButton_Menu(&s_DirectoryButton, Localize("Skins directory"), 0, &DirectoryButton))
 	{
+		char aBuf[128 + IO_MAX_PATH_LENGTH];
 		Storage()->GetCompletePath(IStorage::TYPE_SAVE, "skins7", aBuf, sizeof(aBuf));
 		Storage()->CreateFolder("skins7", IStorage::TYPE_SAVE);
 		Client()->ViewFile(aBuf);
 	}
 	GameClient()->m_Tooltips.DoToolTip(&s_DirectoryButton, &DirectoryButton, Localize("Open the directory to add custom skins"));
-
-	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-	static CButtonContainer s_SkinRefreshButton;
-	if(DoButton_Menu(&s_SkinRefreshButton, FONT_ICON_ARROW_ROTATE_RIGHT, 0, &RefreshButton) ||
-		(!Ui()->IsPopupOpen() && m_pClient->m_GameConsole.IsClosed() && (Input()->KeyPress(KEY_F5) || (Input()->ModifierIsPressed() && Input()->KeyPress(KEY_R)))))
-	{
-		// reset render flags for possible loading screen
-		TextRender()->SetRenderFlags(0);
-		TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-		// TODO: m_pClient->RefreshSkins();
-	}
-	TextRender()->SetRenderFlags(0);
-	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
 }

 void CMenus::PopupConfirmDeleteSkin7()
@ -256,34 +311,51 @@ void CMenus::PopupConfirmDeleteSkin7()
 	m_pSelectedSkin = nullptr;
 }

+void CMenus::RenderSettingsTeeBasic7(CUIRect MainView)
+{
+	RenderSkinSelection7(MainView); // yes thats all here ^^
+}
+
 void CMenus::RenderSettingsTeeCustom7(CUIRect MainView)
 {
-	CUIRect ButtonBar, SkinPartSelection, CustomColors;
+	CUIRect Label, Patterns, Button, Left, Right;

-	MainView.HSplitTop(20.0f, &ButtonBar, &MainView);
-	MainView.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f), IGraphics::CORNER_B, 5.0f);
-	MainView.VSplitMid(&SkinPartSelection, &CustomColors, 10.0f);
-	CustomColors.Margin(5.0f, &CustomColors);
-	CUIRect CustomColorsButton, RandomSkinButton;
-	CustomColors.HSplitTop(20.0f, &CustomColorsButton, &CustomColors);
-	CustomColorsButton.VSplitRight(30.0f, &CustomColorsButton, &RandomSkinButton);
-	CustomColorsButton.VSplitRight(20.0f, &CustomColorsButton, nullptr);
+	// render skin preview background
+	float SpacingH = 2.0f;
+	float SpacingW = 3.0f;
+	float ButtonHeight = 20.0f;

-	const float ButtonWidth = ButtonBar.w / protocol7::NUM_SKINPARTS;
+	MainView.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);

-	static CButtonContainer s_aSkinPartButtons[protocol7::NUM_SKINPARTS];
+	MainView.HSplitTop(ButtonHeight, &Label, &MainView);
+	Ui()->DoLabel(&Label, Localize("Customize"), ButtonHeight * CUi::ms_FontmodHeight * 0.8f, TEXTALIGN_MC);
+
+	// skin part selection
+	MainView.HSplitTop(SpacingH, 0, &MainView);
+	MainView.HSplitTop(ButtonHeight, &Patterns, &MainView);
+	Patterns.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f), 15, 5.0F);
+
+	float ButtonWidth = (Patterns.w / 6.0f) - (SpacingW * 5.0) / 6.0f;
+
+	static CButtonContainer s_aPatternButtons[protocol7::NUM_SKINPARTS];
 	for(int i = 0; i < protocol7::NUM_SKINPARTS; i++)
 	{
-		CUIRect Button;
-		ButtonBar.VSplitLeft(ButtonWidth, &Button, &ButtonBar);
-		const int Corners = i == 0 ? IGraphics::CORNER_TL : (i == (protocol7::NUM_SKINPARTS - 1) ? IGraphics::CORNER_TR : IGraphics::CORNER_NONE);
-		if(DoButton_MenuTab(&s_aSkinPartButtons[i], Localize(CSkins7::ms_apSkinPartNamesLocalized[i], "skins"), m_TeePartSelected == i, &Button, Corners, nullptr, nullptr, nullptr, nullptr, 4.0f))
+		Patterns.VSplitLeft(ButtonWidth, &Button, &Patterns);
+		if(DoButton_MenuTab(&s_aPatternButtons[i], Localize(CSkins7::ms_apSkinPartNames[i], "skins"), m_TeePartSelected == i, &Button, IGraphics::CORNER_ALL))
 		{
 			m_TeePartSelected = i;
 		}
+		Patterns.VSplitLeft(SpacingW, 0, &Patterns);
 	}

-	RenderSkinPartSelection7(SkinPartSelection);
+	MainView.HSplitTop(SpacingH, 0, &MainView);
+	MainView.VSplitMid(&Left, &Right, SpacingW);
+	Right.Margin(5.0f, &Right);
+
+	RenderSkinPartSelection7(Left);
+
+	CUIRect CustomColorsButton;
+	Right.HSplitTop(20.0f, &CustomColorsButton, &Right);

 	int *pUseCustomColor = CSkins7::ms_apUCCVariables[(int)m_Dummy][m_TeePartSelected];
 	if(DoButton_CheckBox(pUseCustomColor, Localize("Custom colors"), *pUseCustomColor, &CustomColorsButton))
@ -294,31 +366,15 @@ void CMenus::RenderSettingsTeeCustom7(CUIRect MainView)

 	if(*pUseCustomColor)
 	{
-		CUIRect CustomColorScrollbars;
-		CustomColors.HSplitTop(5.0f, nullptr, &CustomColors);
-		CustomColors.HSplitTop(95.0f, &CustomColorScrollbars, &CustomColors);
+		CUIRect CustomColors;
+		Right.HSplitTop(5.0f, nullptr, &Right);
+		Right.HSplitTop(95.0f, &CustomColors, &Right);

-		if(RenderHslaScrollbars(&CustomColorScrollbars, CSkins7::ms_apColorVariables[(int)m_Dummy][m_TeePartSelected], m_TeePartSelected == protocol7::SKINPART_MARKING, CSkins7::DARKEST_COLOR_LGT))
+		if(RenderHslaScrollbars(&CustomColors, CSkins7::ms_apColorVariables[(int)m_Dummy][m_TeePartSelected], m_TeePartSelected == protocol7::SKINPART_MARKING, CSkins7::DARKEST_COLOR_LGT))
 		{
 			SetNeedSendInfo();
 		}
 	}
-
-	// Random skin button
-	static CButtonContainer s_RandomSkinButton;
-	static const char *s_apDice[] = {FONT_ICON_DICE_ONE, FONT_ICON_DICE_TWO, FONT_ICON_DICE_THREE, FONT_ICON_DICE_FOUR, FONT_ICON_DICE_FIVE, FONT_ICON_DICE_SIX};
-	static int s_CurrentDie = rand() % std::size(s_apDice);
-	TextRender()->SetFontPreset(EFontPreset::ICON_FONT);
-	TextRender()->SetRenderFlags(ETextRenderFlags::TEXT_RENDER_FLAG_ONLY_ADVANCE_WIDTH | ETextRenderFlags::TEXT_RENDER_FLAG_NO_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_Y_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT | ETextRenderFlags::TEXT_RENDER_FLAG_NO_OVERSIZE);
-	if(DoButton_Menu(&s_RandomSkinButton, s_apDice[s_CurrentDie], 0, &RandomSkinButton, nullptr, IGraphics::CORNER_ALL, 5.0f, -0.2f))
-	{
-		m_pClient->m_Skins7.RandomizeSkin(m_Dummy);
-		SetNeedSendInfo();
-		s_CurrentDie = rand() % std::size(s_apDice);
-	}
-	TextRender()->SetRenderFlags(0);
-	TextRender()->SetFontPreset(EFontPreset::DEFAULT_FONT);
-	GameClient()->m_Tooltips.DoToolTip(&s_RandomSkinButton, &RandomSkinButton, Localize("Create a random skin"));
 }

 void CMenus::RenderSkinSelection7(CUIRect MainView)
@ -333,74 +389,76 @@ void CMenus::RenderSkinSelection7(CUIRect MainView)
 		s_SkinCount = m_pClient->m_Skins7.Num();
 		for(int i = 0; i < s_SkinCount; ++i)
 		{
-			const CSkins7::CSkin *pSkin = m_pClient->m_Skins7.Get(i);
-			if(g_Config.m_ClSkinFilterString[0] != '\0' && !str_utf8_find_nocase(pSkin->m_aName, g_Config.m_ClSkinFilterString))
+			const CSkins7::CSkin *s = m_pClient->m_Skins7.Get(i);
+
+			if(g_Config.m_ClSkinFilterString[0] != '\0' && !str_utf8_find_nocase(s->m_aName, g_Config.m_ClSkinFilterString))
 				continue;

 			// no special skins
-			if((pSkin->m_Flags & CSkins7::SKINFLAG_SPECIAL) == 0)
+			if((s->m_Flags & CSkins7::SKINFLAG_SPECIAL) == 0)
 			{
-				s_vpSkinList.emplace_back(pSkin);
+				s_vpSkinList.emplace_back(s);
 			}
 		}
 		m_SkinListNeedsUpdate = false;
 	}

-	m_pSelectedSkin = nullptr;
+	m_pSelectedSkin = 0;
 	int s_OldSelected = -1;
-	s_ListBox.DoStart(50.0f, s_vpSkinList.size(), 4, 1, s_OldSelected, &MainView);
+	s_ListBox.DoStart(60.0f, s_vpSkinList.size(), 10, 1, s_OldSelected, &MainView);

 	for(int i = 0; i < (int)s_vpSkinList.size(); ++i)
 	{
-		const CSkins7::CSkin *pSkin = s_vpSkinList[i];
-		if(pSkin == nullptr)
+		const CSkins7::CSkin *s = s_vpSkinList[i];
+		if(s == 0)
 			continue;
-		if(!str_comp(pSkin->m_aName, CSkins7::ms_apSkinNameVariables[m_Dummy]))
+		if(!str_comp(s->m_aName, Config()->m_ClPlayer7Skin))
 		{
-			m_pSelectedSkin = pSkin;
+			m_pSelectedSkin = s;
 			s_OldSelected = i;
 		}

-		const CListboxItem Item = s_ListBox.DoNextItem(&s_vpSkinList[i], s_OldSelected == i);
-		if(!Item.m_Visible)
-			continue;
-
-		CUIRect TeePreview, Label;
-		Item.m_Rect.VSplitLeft(60.0f, &TeePreview, &Label);
-
-		CTeeRenderInfo Info;
-		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
+		CListboxItem Item = s_ListBox.DoNextItem(&s_vpSkinList[i], s_OldSelected == i);
+		if(Item.m_Visible)
 		{
-			if(pSkin->m_aUseCustomColors[Part])
+			CTeeRenderInfo Info;
+			for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
 			{
-				Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkin->m_apParts[Part]->m_ColorTexture;
-				Info.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(pSkin->m_aPartColors[Part], Part == protocol7::SKINPART_MARKING);
+				if(s->m_aUseCustomColors[Part])
+				{
+					Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = s->m_apParts[Part]->m_ColorTexture;
+					Info.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = m_pClient->m_Skins7.GetColor(s->m_aPartColors[Part], Part == protocol7::SKINPART_MARKING);
+				}
+				else
+				{
+					Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = s->m_apParts[Part]->m_OrgTexture;
+					Info.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+				}
 			}
-			else
+
+			Info.m_Size = 50.0f;
+			Item.m_Rect.HSplitTop(5.0f, 0, &Item.m_Rect); // some margin from the top
+
 			{
-				Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[Part] = pSkin->m_apParts[Part]->m_OrgTexture;
-				Info.m_aSixup[g_Config.m_ClDummy].m_aColors[Part] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+				// interactive tee: tee is happy to be selected
+				int TeeEmote = (Item.m_Selected && s_LastSelectionTime + 0.75f > Client()->LocalTime()) ? EMOTE_HAPPY : EMOTE_NORMAL;
+				RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, TeeEmote, vec2(1.0f, 0.0f), vec2(Item.m_Rect.x + Item.m_Rect.w / 2, Item.m_Rect.y + Item.m_Rect.h / 2));
 			}
-		}
-		Info.m_Size = 50.0f;

-		{
-			// interactive tee: tee is happy to be selected
-			int TeeEmote = (Item.m_Selected && s_LastSelectionTime + 0.75f > Client()->GlobalTime()) ? EMOTE_HAPPY : EMOTE_NORMAL;
-			RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, TeeEmote, vec2(1.0f, 0.0f), TeePreview.Center() + vec2(0.0f, 6.0f));
-		}
+			CUIRect Label;
+			Item.m_Rect.Margin(5.0f, &Item.m_Rect);
+			Item.m_Rect.HSplitBottom(10.0f, &Item.m_Rect, &Label);

-		SLabelProperties Props;
-		Props.m_MaxWidth = Label.w - 5.0f;
-		Ui()->DoLabel(&Label, pSkin->m_aName, 12.0f, TEXTALIGN_ML, Props);
+			Ui()->DoLabel(&Label, s->m_aName, 10.0f, TEXTALIGN_MC);
+		}
 	}

 	const int NewSelected = s_ListBox.DoEnd();
 	if(NewSelected != -1 && NewSelected != s_OldSelected)
 	{
-		s_LastSelectionTime = Client()->GlobalTime();
+		s_LastSelectionTime = Client()->LocalTime();
 		m_pSelectedSkin = s_vpSkinList[NewSelected];
-		str_copy(CSkins7::ms_apSkinNameVariables[m_Dummy], m_pSelectedSkin->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
+		str_copy(Config()->m_ClPlayer7Skin, m_pSelectedSkin->m_aName);
 		for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
 		{
 			str_copy(CSkins7::ms_apSkinVariables[(int)m_Dummy][Part], m_pSelectedSkin->m_apParts[Part]->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
@ -423,11 +481,11 @@ void CMenus::RenderSkinPartSelection7(CUIRect MainView)
 			s_paList[Part].clear();
 			for(int i = 0; i < m_pClient->m_Skins7.NumSkinPart(Part); ++i)
 			{
-				const CSkins7::CSkinPart *pPart = m_pClient->m_Skins7.GetSkinPart(Part, i);
+				const CSkins7::CSkinPart *s = m_pClient->m_Skins7.GetSkinPart(Part, i);
 				// no special skins
-				if((pPart->m_Flags & CSkins7::SKINFLAG_SPECIAL) == 0)
+				if((s->m_Flags & CSkins7::SKINFLAG_SPECIAL) == 0)
 				{
-					s_paList[Part].emplace_back(pPart);
+					s_paList[Part].emplace_back(s);
 				}
 			}
 		}
@ -436,62 +494,71 @@ void CMenus::RenderSkinPartSelection7(CUIRect MainView)

 	static int s_OldSelected = -1;
 	s_ListBox.DoBegin(&MainView);
-	s_ListBox.DoStart(72.0f, s_paList[m_TeePartSelected].size(), 4, 1, s_OldSelected, nullptr, false, IGraphics::CORNER_NONE, true);
+	s_ListBox.DoStart(60.0f, s_paList[m_TeePartSelected].size(), 5, 1, s_OldSelected);

 	for(int i = 0; i < (int)s_paList[m_TeePartSelected].size(); ++i)
 	{
-		const CSkins7::CSkinPart *pPart = s_paList[m_TeePartSelected][i];
-		if(pPart == nullptr)
+		const CSkins7::CSkinPart *s = s_paList[m_TeePartSelected][i];
+		if(s == 0)
 			continue;
-		if(!str_comp(pPart->m_aName, CSkins7::ms_apSkinVariables[(int)m_Dummy][m_TeePartSelected]))
+		if(!str_comp(s->m_aName, CSkins7::ms_apSkinVariables[(int)m_Dummy][m_TeePartSelected]))
 			s_OldSelected = i;

 		CListboxItem Item = s_ListBox.DoNextItem(&s_paList[m_TeePartSelected][i], s_OldSelected == i);
-		if(!Item.m_Visible)
-			continue;
-
-		CUIRect Label;
-		Item.m_Rect.Margin(5.0f, &Item.m_Rect);
-		Item.m_Rect.HSplitBottom(12.0f, &Item.m_Rect, &Label);
-
-		CTeeRenderInfo Info;
-		for(int j = 0; j < protocol7::NUM_SKINPARTS; j++)
+		if(Item.m_Visible)
 		{
-			int SkinPart = m_pClient->m_Skins7.FindSkinPart(j, CSkins7::ms_apSkinVariables[(int)m_Dummy][j], false);
-			const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(j, SkinPart);
-			if(*CSkins7::ms_apUCCVariables[(int)m_Dummy][j])
+			CTeeRenderInfo Info;
+			for(int j = 0; j < protocol7::NUM_SKINPARTS; j++)
 			{
-				Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[j] = m_TeePartSelected == j ? pPart->m_ColorTexture : pSkinPart->m_ColorTexture;
-				Info.m_aSixup[g_Config.m_ClDummy].m_aColors[j] = m_pClient->m_Skins7.GetColor(*CSkins7::ms_apColorVariables[(int)m_Dummy][j], j == protocol7::SKINPART_MARKING);
+				int SkinPart = m_pClient->m_Skins7.FindSkinPart(j, CSkins7::ms_apSkinVariables[(int)m_Dummy][j], false);
+				const CSkins7::CSkinPart *pSkinPart = m_pClient->m_Skins7.GetSkinPart(j, SkinPart);
+				if(*CSkins7::ms_apUCCVariables[(int)m_Dummy][j])
+				{
+					if(m_TeePartSelected == j)
+						Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[j] = s->m_ColorTexture;
+					else
+						Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[j] = pSkinPart->m_ColorTexture;
+					Info.m_aSixup[g_Config.m_ClDummy].m_aColors[j] = m_pClient->m_Skins7.GetColor(*CSkins7::ms_apColorVariables[(int)m_Dummy][j], j == protocol7::SKINPART_MARKING);
+				}
+				else
+				{
+					if(m_TeePartSelected == j)
+						Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[j] = s->m_OrgTexture;
+					else
+						Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[j] = pSkinPart->m_OrgTexture;
+					Info.m_aSixup[0].m_aColors[j] = vec4(1.0f, 1.0f, 1.0f, 1.0f);
+				}
 			}
-			else
+			Info.m_Size = 50.0f;
+			Item.m_Rect.HSplitTop(5.0f, 0, &Item.m_Rect); // some margin from the top
+			const vec2 TeePos(Item.m_Rect.x + Item.m_Rect.w / 2, Item.m_Rect.y + Item.m_Rect.h / 2);
+
+			if(m_TeePartSelected == protocol7::SKINPART_HANDS)
 			{
-				Info.m_aSixup[g_Config.m_ClDummy].m_aTextures[j] = m_TeePartSelected == j ? pPart->m_OrgTexture : pSkinPart->m_OrgTexture;
-				Info.m_aSixup[0].m_aColors[j] = ColorRGBA(1.0f, 1.0f, 1.0f, 1.0f);
+				// RenderTools()->RenderTeeHand(&Info, TeePos, vec2(1.0f, 0.0f), -pi*0.5f, vec2(18, 0));
 			}
-		}
-		Info.m_Size = 50.0f;
+			int TeePartEmote = EMOTE_NORMAL;
+			if(m_TeePartSelected == protocol7::SKINPART_EYES)
+			{
+				float LocalTime = Client()->LocalTime();
+				TeePartEmote = (int)(LocalTime * 0.5f) % NUM_EMOTES;
+			}
+			RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, TeePartEmote, vec2(1.0f, 0.0f), TeePos);

-		const vec2 TeePos = Item.m_Rect.Center() + vec2(0.0f, 6.0f);
-		if(m_TeePartSelected == protocol7::SKINPART_HANDS)
-		{
-			// RenderTools()->RenderTeeHand(&Info, TeePos, vec2(1.0f, 0.0f), -pi*0.5f, vec2(18, 0));
-		}
-		int TeePartEmote = EMOTE_NORMAL;
-		if(m_TeePartSelected == protocol7::SKINPART_EYES)
-		{
-			TeePartEmote = (int)(Client()->GlobalTime() * 0.5f) % NUM_EMOTES;
-		}
-		RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, TeePartEmote, vec2(1.0f, 0.0f), TeePos);
+			CUIRect Label;
+			Item.m_Rect.Margin(5.0f, &Item.m_Rect);
+			Item.m_Rect.HSplitBottom(10.0f, &Item.m_Rect, &Label);

-		Ui()->DoLabel(&Label, pPart->m_aName, 12.0f, TEXTALIGN_MC);
+			Ui()->DoLabel(&Label, s->m_aName, 10.0f, TEXTALIGN_MC);
+		}
 	}

 	const int NewSelected = s_ListBox.DoEnd();
 	if(NewSelected != -1 && NewSelected != s_OldSelected)
 	{
-		str_copy(CSkins7::ms_apSkinVariables[(int)m_Dummy][m_TeePartSelected], s_paList[m_TeePartSelected][NewSelected]->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
-		CSkins7::ms_apSkinNameVariables[m_Dummy][0] = '\0';
+		const CSkins7::CSkinPart *s = s_paList[m_TeePartSelected][NewSelected];
+		str_copy(CSkins7::ms_apSkinVariables[(int)m_Dummy][m_TeePartSelected], s->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
+		Config()->m_ClPlayer7Skin[0] = 0;
 		SetNeedSendInfo();
 	}
 	s_OldSelected = NewSelected;
--- a/src/game/client/components/players.cpp
+++ b/src/game/client/components/players.cpp
@ -844,7 +844,10 @@ void CPlayers::OnRender()
 			{
 				aRenderInfo[i].m_aSixup[g_Config.m_ClDummy].Reset();

-				aRenderInfo[i].Apply(pSkin);
+				aRenderInfo[i].m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+				aRenderInfo[i].m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+				aRenderInfo[i].m_BloodColor = pSkin->m_BloodColor;
+				aRenderInfo[i].m_SkinMetrics = pSkin->m_Metrics;
 				aRenderInfo[i].m_CustomColoredSkin = IsTeamplay;
 				if(!IsTeamplay)
 				{
@ -854,8 +857,12 @@ void CPlayers::OnRender()
 			}
 		}
 	}
+	const CSkin *pSkin = m_pClient->m_Skins.Find("x_spec");
 	CTeeRenderInfo RenderInfoSpec;
-	RenderInfoSpec.Apply(m_pClient->m_Skins.Find("x_spec"));
+	RenderInfoSpec.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+	RenderInfoSpec.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+	RenderInfoSpec.m_BloodColor = pSkin->m_BloodColor;
+	RenderInfoSpec.m_SkinMetrics = pSkin->m_Metrics;
 	RenderInfoSpec.m_CustomColoredSkin = false;
 	RenderInfoSpec.m_Size = 64.0f;
 	const int LocalClientId = m_pClient->m_Snap.m_LocalClientId;
--- a/src/game/client/components/skins7.cpp
+++ b/src/game/client/components/skins7.cpp
@ -9,7 +9,6 @@
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
 #include <engine/shared/jsonwriter.h>
-#include <engine/shared/localization.h>
 #include <engine/shared/protocol7.h>
 #include <engine/storage.h>

@ -20,10 +19,8 @@
 #include "skins7.h"

 const char *const CSkins7::ms_apSkinPartNames[protocol7::NUM_SKINPARTS] = {"body", "marking", "decoration", "hands", "feet", "eyes"};
-const char *const CSkins7::ms_apSkinPartNamesLocalized[protocol7::NUM_SKINPARTS] = {Localizable("Body", "skins"), Localizable("Marking", "skins"), Localizable("Decoration", "skins"), Localizable("Hands", "skins"), Localizable("Feet", "skins"), Localizable("Eyes", "skins")};
 const char *const CSkins7::ms_apColorComponents[NUM_COLOR_COMPONENTS] = {"hue", "sat", "lgt", "alp"};

-char *CSkins7::ms_apSkinNameVariables[NUM_DUMMIES] = {0};
 char *CSkins7::ms_apSkinVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS] = {{0}};
 int *CSkins7::ms_apUCCVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS] = {{0}};
 int unsigned *CSkins7::ms_apColorVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS] = {{0}};
@ -232,7 +229,6 @@ int CSkins7::GetInitAmount() const
 void CSkins7::OnInit()
 {
 	int Dummy = 0;
-	ms_apSkinNameVariables[Dummy] = Config()->m_ClPlayer7Skin;
 	ms_apSkinVariables[Dummy][protocol7::SKINPART_BODY] = Config()->m_ClPlayer7SkinBody;
 	ms_apSkinVariables[Dummy][protocol7::SKINPART_MARKING] = Config()->m_ClPlayer7SkinMarking;
 	ms_apSkinVariables[Dummy][protocol7::SKINPART_DECORATION] = Config()->m_ClPlayer7SkinDecoration;
@ -253,7 +249,6 @@ void CSkins7::OnInit()
 	ms_apColorVariables[Dummy][protocol7::SKINPART_EYES] = &Config()->m_ClPlayer7ColorEyes;

 	Dummy = 1;
-	ms_apSkinNameVariables[Dummy] = Config()->m_ClDummy7Skin;
 	ms_apSkinVariables[Dummy][protocol7::SKINPART_BODY] = Config()->m_ClDummy7SkinBody;
 	ms_apSkinVariables[Dummy][protocol7::SKINPART_MARKING] = Config()->m_ClDummy7SkinMarking;
 	ms_apSkinVariables[Dummy][protocol7::SKINPART_DECORATION] = Config()->m_ClDummy7SkinDecoration;
@ -466,19 +461,17 @@ void CSkins7::RandomizeSkin(int Dummy)
 		if(Part == protocol7::SKINPART_MARKING)
 			Alp = rand() % 255;
 		int ColorVariable = (Alp << 24) | (Hue << 16) | (Sat << 8) | Lgt;
-		*ms_apUCCVariables[Dummy][Part] = true;
-		*ms_apColorVariables[Dummy][Part] = ColorVariable;
+		*CSkins7::ms_apUCCVariables[Dummy][Part] = true;
+		*CSkins7::ms_apColorVariables[Dummy][Part] = ColorVariable;
 	}

 	for(int Part = 0; Part < protocol7::NUM_SKINPARTS; Part++)
 	{
-		const CSkinPart *pSkinPart = GetSkinPart(Part, rand() % NumSkinPart(Part));
-		while(pSkinPart->m_Flags & SKINFLAG_SPECIAL)
+		const CSkins7::CSkinPart *pSkinPart = GetSkinPart(Part, rand() % NumSkinPart(Part));
+		while(pSkinPart->m_Flags & CSkins7::SKINFLAG_SPECIAL)
 			pSkinPart = GetSkinPart(Part, rand() % NumSkinPart(Part));
-		str_copy(ms_apSkinVariables[Dummy][Part], pSkinPart->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
+		mem_copy(CSkins7::ms_apSkinVariables[Dummy][Part], pSkinPart->m_aName, protocol7::MAX_SKIN_ARRAY_SIZE);
 	}
-
-	ms_apSkinNameVariables[Dummy][0] = '\0';
 }

 ColorRGBA CSkins7::GetColor(int Value, bool UseAlpha) const
--- a/src/game/client/components/skins7.h
+++ b/src/game/client/components/skins7.h
@ -52,10 +52,8 @@ public:
 	};

 	static const char *const ms_apSkinPartNames[protocol7::NUM_SKINPARTS];
-	static const char *const ms_apSkinPartNamesLocalized[protocol7::NUM_SKINPARTS];
 	static const char *const ms_apColorComponents[NUM_COLOR_COMPONENTS];

-	static char *ms_apSkinNameVariables[NUM_DUMMIES];
 	static char *ms_apSkinVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS];
 	static int *ms_apUCCVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS]; // use custom color
 	static unsigned int *ms_apColorVariables[NUM_DUMMIES][protocol7::NUM_SKINPARTS];
--- a/src/game/client/components/statboard.cpp
+++ b/src/game/client/components/statboard.cpp
@ -102,7 +102,7 @@ void CStatboard::OnMessage(int MsgType, void *pRawMsg)

 				if(t <= p)
 					return;
-				str_truncate(aName, sizeof(aName), p, t - p);
+				str_utf8_truncate(aName, sizeof(aName), p, t - p);

 				for(int i = 0; i < MAX_CLIENTS; i++)
 				{
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@ -1554,7 +1554,11 @@ void CGameClient::OnNewSnapshot()
 					pClient->m_SkinInfo.m_Size = 64;

 					// find new skin
-					pClient->m_SkinInfo.Apply(m_Skins.Find(pClient->m_aSkinName));
+					const CSkin *pSkin = m_Skins.Find(pClient->m_aSkinName);
+					pClient->m_SkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+					pClient->m_SkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
+					pClient->m_SkinInfo.m_SkinMetrics = pSkin->m_Metrics;
+					pClient->m_SkinInfo.m_BloodColor = pSkin->m_BloodColor;
 					pClient->m_SkinInfo.m_CustomColoredSkin = pClient->m_UseCustomColor;

 					if(!pClient->m_UseCustomColor)
@ -3746,9 +3750,13 @@ void CGameClient::RefreshSkins()

 	for(auto &Client : m_aClients)
 	{
+		Client.m_SkinInfo.m_OriginalRenderSkin.Reset();
+		Client.m_SkinInfo.m_ColorableRenderSkin.Reset();
 		if(Client.m_aSkinName[0] != '\0')
 		{
-			Client.m_SkinInfo.Apply(m_Skins.Find(Client.m_aSkinName));
+			const CSkin *pSkin = m_Skins.Find(Client.m_aSkinName);
+			Client.m_SkinInfo.m_OriginalRenderSkin = pSkin->m_OriginalSkin;
+			Client.m_SkinInfo.m_ColorableRenderSkin = pSkin->m_ColorableSkin;
 		}
 		else
 		{
--- a/src/game/client/render.h
+++ b/src/game/client/render.h
@ -56,14 +56,6 @@ public:
 			Sixup.Reset();
 	}

-	void Apply(const CSkin *pSkin)
-	{
-		m_OriginalRenderSkin = pSkin->m_OriginalSkin;
-		m_ColorableRenderSkin = pSkin->m_ColorableSkin;
-		m_BloodColor = pSkin->m_BloodColor;
-		m_SkinMetrics = pSkin->m_Metrics;
-	}
-
 	CSkin::SSkinTextures m_OriginalRenderSkin;
 	CSkin::SSkinTextures m_ColorableRenderSkin;

--- a/src/game/client/ui.cpp
+++ b/src/game/client/ui.cpp
@ -1301,24 +1301,21 @@ float CUi::DoScrollbarV(const void *pId, const CUIRect *pRect, float Current)
 	}
 	else if(HotItem() == pId)
 	{
-		if(InsideHandle)
-		{
-			if(MouseButton(0))
-			{
-				SetActiveItem(pId);
-				m_ActiveScrollbarOffset = MouseY() - Handle.y;
-				Grabbed = true;
-			}
-		}
-		else if(MouseButtonClicked(0))
+		if(MouseButton(0))
 		{
 			SetActiveItem(pId);
-			m_ActiveScrollbarOffset = Handle.h / 2.0f;
+			m_ActiveScrollbarOffset = MouseY() - Handle.y;
 			Grabbed = true;
 		}
 	}
+	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+	{
+		SetActiveItem(pId);
+		m_ActiveScrollbarOffset = Handle.h / 2.0f;
+		Grabbed = true;
+	}

-	if(InsideRail && !MouseButton(0))
+	if(InsideHandle && !MouseButton(0))
 	{
 		SetHotItem(pId);
 	}
@ -1383,22 +1380,19 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
 	}
 	else if(HotItem() == pId)
 	{
-		if(InsideHandle)
-		{
-			if(MouseButton(0))
-			{
-				SetActiveItem(pId);
-				m_ActiveScrollbarOffset = MouseX() - Handle.x;
-				Grabbed = true;
-			}
-		}
-		else if(MouseButtonClicked(0))
+		if(MouseButton(0))
 		{
 			SetActiveItem(pId);
-			m_ActiveScrollbarOffset = Handle.w / 2.0f;
+			m_ActiveScrollbarOffset = MouseX() - Handle.x;
 			Grabbed = true;
 		}
 	}
+	else if(MouseButtonClicked(0) && !InsideHandle && InsideRail)
+	{
+		SetActiveItem(pId);
+		m_ActiveScrollbarOffset = Handle.w / 2.0f;
+		Grabbed = true;
+	}

 	if(!pColorInner && (InsideHandle || Grabbed) && (CheckActiveItem(pId) || HotItem() == pId))
 	{
@ -1406,7 +1400,7 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
 		Handle.y -= 1.5f;
 	}

-	if(InsideRail && !MouseButton(0))
+	if(InsideHandle && !MouseButton(0))
 	{
 		SetHotItem(pId);
 	}
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@ -3526,7 +3526,7 @@ void CGameContext::ConAddMapVotes(IConsole::IResult *pResult, void *pUserData)
 			str_format(aCommand, sizeof(aCommand), "clear_votes; add_map_votes \"%s\"", aDirectory);
 		}
 		else
-			str_format(aCommand, sizeof(aCommand), "change_map \"%s%s%s\"", pDirectory, pDirectory[0] == '\0' ? "" : "/", aOptionEscaped);
+			str_format(aCommand, sizeof(aCommand), "change_map \"%s/%s\"", pDirectory, aOptionEscaped);

 		pSelf->AddVote(aDescription, aCommand);
 	}
--- a/src/game/version.h
+++ b/src/game/version.h
@ -3,7 +3,7 @@
 #ifndef GAME_VERSION_H
 #define GAME_VERSION_H
 #ifndef GAME_RELEASE_VERSION
-#define GAME_RELEASE_VERSION "18.5.1"
+#define GAME_RELEASE_VERSION "18.5"
 #endif

 // teeworlds
@ -13,7 +13,7 @@
 #define GAME_NETVERSION7 "0.7 802f1be60a05665f"

 // ddnet
-#define DDNET_VERSION_NUMBER 18051
+#define DDNET_VERSION_NUMBER 18050
 extern const char *GIT_SHORTREV_HASH;
 #define GAME_NAME "DDNet"
 #endif