use CardSize

sjrc6 · Dec 7, 2024 · 61cd23a · 61cd23a
1 parent 7f21724
commit 61cd23a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/game/client/components/tclient/menus_tclient.cpp b/src/game/client/components/tclient/menus_tclient.cpp
@@ -771,8 +771,8 @@ void CMenus::RenderSettingsTClient(CUIRect MainView)
 		bool WhiteFeetTemp = g_Config.m_ClWhiteFeet;
 		g_Config.m_ClWhiteFeet = false;
 		{
-			RightView.HSplitTop(TeeSize + MarginSmall, &DevCardRect, &RightView);
-			DevCardRect.VSplitLeft(TeeSize + MarginSmall, &TeeRect, &Label);
+			RightView.HSplitTop(CardSize, &DevCardRect, &RightView);
+			DevCardRect.VSplitLeft(CardSize, &TeeRect, &Label);
 			Label.VSplitLeft(TextRender()->TextWidth(LineSize, "Tater"), &Label, &Button);
 			Button.VSplitLeft(MarginSmall, nullptr, &Button);
 			Button.w = LineSize, Button.h = LineSize, Button.y = Label.y + (Label.h / 2.0f - Button.h / 2.0f);
@@ -782,8 +782,8 @@ void CMenus::RenderSettingsTClient(CUIRect MainView)
 			RenderDevSkin(TeeRect.Center(), 50.0f, "glow_mermyfox", "mermyfox", true, 15911221, 9981775, 0, false);
 		}
 		{
-			RightView.HSplitTop(TeeSize + MarginSmall, &DevCardRect, &RightView);
-			DevCardRect.VSplitLeft(TeeSize + MarginSmall, &TeeRect, &Label);
+			RightView.HSplitTop(CardSize, &DevCardRect, &RightView);
+			DevCardRect.VSplitLeft(CardSize, &TeeRect, &Label);
 			Label.VSplitLeft(TextRender()->TextWidth(LineSize, "Solly"), &Label, &Button);
 			Button.VSplitLeft(MarginSmall, nullptr, &Button);
 			Button.w = LineSize, Button.h = LineSize, Button.y = Label.y + (Label.h / 2.0f - Button.h / 2.0f);
@@ -793,8 +793,8 @@ void CMenus::RenderSettingsTClient(CUIRect MainView)
 			RenderDevSkin(TeeRect.Center(), 50.0f, "tuzi", "tuzi", false, 10944256, 2621184, 2, true);
 		}
 		{
-			RightView.HSplitTop(TeeSize + MarginSmall, &DevCardRect, &RightView);
-			DevCardRect.VSplitLeft(TeeSize + MarginSmall, &TeeRect, &Label);
+			RightView.HSplitTop(CardSize, &DevCardRect, &RightView);
+			DevCardRect.VSplitLeft(CardSize, &TeeRect, &Label);
 			Label.VSplitLeft(TextRender()->TextWidth(LineSize, "Daniel"), &Label, &Button);
 			Button.VSplitLeft(MarginSmall, nullptr, &Button);
 			Button.w = LineSize, Button.h = LineSize, Button.y = Label.y + (Label.h / 2.0f - Button.h / 2.0f);
@@ -805,8 +805,8 @@ void CMenus::RenderSettingsTClient(CUIRect MainView)
 		}
 
 		{
-			RightView.HSplitTop(TeeSize + MarginSmall, &DevCardRect, &RightView);
-			DevCardRect.VSplitLeft(TeeSize + MarginSmall, &TeeRect, &Label);
+			RightView.HSplitTop(CardSize, &DevCardRect, &RightView);
+			DevCardRect.VSplitLeft(CardSize, &TeeRect, &Label);
 			Label.VSplitLeft(TextRender()->TextWidth(LineSize, "Teero"), &Label, &Button);
 			Button.VSplitLeft(MarginSmall, nullptr, &Button);
 			Button.w = LineSize, Button.h = LineSize, Button.y = Label.y + (Label.h / 2.0f - Button.h / 2.0f);

diff --git a/src/game/client/components/tclient/warlist.cpp b/src/game/client/components/tclient/warlist.cpp
@@ -252,7 +252,7 @@ void CWarList::UpdateWarPlayers()
 				m_WarPlayers[i].IsWarName = true;
 				m_WarPlayers[i].m_NameColor = Entry.m_pWarType->m_Color;
 			}
-			else if(Entry.m_aClan && str_comp(GameClient()->m_aClients[i].m_aClan, Entry.m_aClan))
+			else if(str_comp(GameClient()->m_aClients[i].m_aClan, Entry.m_aClan))
 			{
 				// Name war reason has priority over clan war reason
 				if(!m_WarPlayers[i].IsWarName)