bug fix

sjrc6 · May 12, 2022 · fa237ac · fa237ac
1 parent 8ba33f6
commit fa237ac
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
@@ -670,8 +670,16 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
 		RandomColorsButton.VSplitLeft(150.0f, &RandomColorsButton, 0);
 		if(DoButton_Menu(&s_RandomizeColors, "Randomize Colors", 0, &RandomColorsButton, 0, CUI::CORNER_ALL, 5.0f, 0.0f, vec4(0, 0, 0, 0.5f), vec4(0, 0, 0, 0.25f)))
 		{
-			g_Config.m_ClPlayerColorBody = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
-			g_Config.m_ClPlayerColorFeet = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+			if(m_Dummy)
+			{
+				g_Config.m_ClDummyColorBody = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+				g_Config.m_ClDummyColorFeet = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+			}
+			else
+			{
+				g_Config.m_ClPlayerColorBody = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+				g_Config.m_ClPlayerColorFeet = ColorHSLA((std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, (std::rand() % 100) / 100.0f, 1).Pack(false);
+			}
 			SetNeedSendInfo();
 			m_DoubleClickIndex = -1;
 		}

diff --git a/src/game/client/components/outlines.cpp b/src/game/client/components/outlines.cpp
@@ -22,9 +22,9 @@ void COutlines::OnRender()
 		CMapItemGroup *pGroup = GameClient()->Layers()->GetGroup(g);
 
 		if(!pGroup)
-		
+
 			continue;
-		
+
 		bool PassedGameLayer = false;
 
 		CTile *pGameTiles = NULL;
@@ -48,29 +48,18 @@ void COutlines::OnRender()
 				IsEntityLayer = IsGameLayer = true;
 				PassedGameLayer = true;
 			}
-			if(pLayer == (CMapItemLayer *)GameClient()->Layers()->FrontLayer())
-				IsEntityLayer = IsFrontLayer = true;
-
-			if(pLayer == (CMapItemLayer *)GameClient()->Layers()->SwitchLayer())
-				IsEntityLayer = IsSwitchLayer = true;
-
 			if(pLayer == (CMapItemLayer *)GameClient()->Layers()->TeleLayer())
 				IsEntityLayer = IsTeleLayer = true;
 
-			if(pLayer == (CMapItemLayer *)GameClient()->Layers()->SpeedupLayer())
-				IsEntityLayer = IsSpeedupLayer = true;
-
-			if(pLayer == (CMapItemLayer *)GameClient()->Layers()->TuneLayer())
-				IsEntityLayer = IsTuneLayer = true;
-
 			if(g_Config.m_ClOutline && IsGameLayer)
 			{
 				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
-
+				if(!pTMap)
+					return;
 				CTile *pTiles = (CTile *)GameClient()->Layers()->Map()->GetData(pTMap->m_Data);
-				unsigned int Size = GameClient()->Layers()->Map()->GetDataSize(pTMap->m_Data);
-				if(!pTiles || !pTMap)
+				if(!pTiles)
 					return;
+				unsigned int Size = GameClient()->Layers()->Map()->GetDataSize(pTMap->m_Data);
 				if(IsGameLayer)
 					pGameTiles = pTiles;
 				if((g_Config.m_ClOutlineFreeze || g_Config.m_ClOutlineSolid || g_Config.m_ClOutlineUnFreeze) && IsGameLayer && Size >= (size_t)pTMap->m_Width * pTMap->m_Height * sizeof(CTile))
@@ -86,10 +75,12 @@ void COutlines::OnRender()
 			if(g_Config.m_ClOutline && IsTeleLayer)
 			{
 				CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
+				if(!pTMap)
+					return;
 				CTile *pTiles = (CTile *)GameClient()->Layers()->Map()->GetData(pTMap->m_Data);
-				unsigned int Size = GameClient()->Layers()->Map()->GetDataSize(pTMap->m_Data);
-				if(!pTiles || !pTMap)
+				if(!pTiles)
 					return;
+				unsigned int Size = GameClient()->Layers()->Map()->GetDataSize(pTMap->m_Data);
 				if(IsGameLayer)
 					pGameTiles = pTiles;
 				if(g_Config.m_ClOutlineTele && IsTeleLayer)