visual changes and fixes

glow should be more consistent between different types now
also actually stage menu vars for f82af0a wow amazing

Author: rei-2

Amalgam/Amalgam.vcxproj

@@ -1055,6 +1055,7 @@
     <ClCompile Include="src\Hooks\NotificationQueue_Add.cpp" />
     <ClCompile Include="src\Hooks\RecvProxy_SimulationTime.cpp" />
     <ClCompile Include="src\Hooks\R_DrawSkyBox.cpp" />
+    <ClCompile Include="src\Hooks\CTFPlayer_InSameDisguisedTeam.cpp" />
     <ClCompile Include="src\Hooks\TF_IsHolidayActive.cpp" />
     <ClCompile Include="src\Hooks\VGuiMenuBuilder_AddMenuItem.cpp" />
     <ClCompile Include="src\SDK\Definitions\Main\CBaseAnimating.cpp" />
@@ -1255,6 +1256,7 @@
     <ClInclude Include="src\SDK\Definitions\Interfaces\CTFGameRules.h" />
     <ClInclude Include="src\SDK\Definitions\Interfaces\CTFGCClientSystem.h" />
     <ClInclude Include="src\SDK\Definitions\Interfaces\CHLClient.h" />
+    <ClInclude Include="src\SDK\Definitions\Interfaces\CThirdPersonManager.h" />
     <ClInclude Include="src\SDK\Definitions\Interfaces\IFileSystem.h" />
     <ClInclude Include="src\SDK\Definitions\Interfaces\IGameMovement.h" />
     <ClInclude Include="src\SDK\Definitions\Interfaces\IInput.h" />

Amalgam/Amalgam.vcxproj.filters

@@ -200,6 +200,7 @@
     <ClCompile Include="src\Hooks\CBasePlayer_CalcObserverView.cpp" />
     <ClCompile Include="src\Hooks\CTFPlayerShared_ShouldSuppressPrediction.cpp" />
     <ClCompile Include="src\Hooks\CHLTVCamera_CalcView.cpp" />
+    <ClCompile Include="src\Hooks\CTFPlayer_InSameDisguisedTeam.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Utils\UtlVector\UtlVector.h" />
@@ -585,6 +586,7 @@
     <ClInclude Include="src\SDK\Definitions\Interfaces\IMemAlloc.h" />
     <ClInclude Include="src\SDK\Definitions\Main\CPredictionCopy.h" />
     <ClInclude Include="src\SDK\Definitions\Interfaces\CHLTVCamera.h" />
+    <ClInclude Include="src\SDK\Definitions\Interfaces\CThirdPersonManager.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="cpp.hint" />

Amalgam/src/Features/ImGui/Menu/Menu.cpp

@@ -318,8 +318,9 @@ void CMenu::MenuAimbot(int iTab)
 						FSlider(Vars::Aimbot::Projectile::SplashNormalSkip, FSliderEnum::Right);
 						FDropdown(Vars::Aimbot::Projectile::SplashMode, FDropdownEnum::Left);
 						FDropdown(Vars::Aimbot::Projectile::RocketSplashMode, FDropdownEnum::Right, 0, &Hovered); FTooltip("Special splash type for rockets, more expensive", Hovered);
-						FToggle(Vars::Aimbot::Projectile::SplashGrates, FSliderEnum::Left);
-						FSlider(Vars::Aimbot::Projectile::Out2NormalCheck, FSliderEnum::Right);
+						FToggle(Vars::Aimbot::Projectile::SplashGrates);
+						FSlider(Vars::Aimbot::Projectile::Out2NormalMin, FSliderEnum::Left);
+						FSlider(Vars::Aimbot::Projectile::Out2NormalMax, FSliderEnum::Right);
 
 						Divider();
 						FText("Misc");
@@ -1100,7 +1101,7 @@ void CMenu::MenuMisc(int iTab)
 				if (Section("Queueing"))
 				{
 					FDropdown(Vars::Misc::Queueing::ForceRegions);
-					FToggle(Vars::Misc::Queueing::FreezeQueue, FToggleEnum::Left);
+					FToggle(Vars::Misc::Queueing::ExtendQueue, FToggleEnum::Left);
 					FToggle(Vars::Misc::Queueing::AutoCasualQueue, FToggleEnum::Right);
 				} EndSection();
 				if (Section("Sound"))
@@ -1312,13 +1313,13 @@ void CMenu::MenuLogs(int iTab)
 
 						// text + icons
 						int lOffset = H::Draw.Scale(10);
-						if (tPlayer.m_bLocal || F::Spectate.m_iIntendedTarget == tPlayer.m_iUserID || tPlayer.m_bFriend || tPlayer.m_bParty)
+						if (tPlayer.m_bLocal || F::Spectate.GetTarget(true) == tPlayer.m_iUserID || tPlayer.m_bFriend || tPlayer.m_bParty)
 						{
 							lOffset += H::Draw.Scale(19);
 							SetCursorPos({ vOriginalPos.x + H::Draw.Scale(7), vOriginalPos.y + H::Draw.Scale(6) });
 							if (tPlayer.m_bLocal)
 								IconImage(ICON_MD_PERSON);
-							else if (F::Spectate.m_iIntendedTarget == tPlayer.m_iUserID)
+							else if (F::Spectate.GetTarget(true) == tPlayer.m_iUserID)
 								IconImage(ICON_MD_VISIBILITY);
 							else if (tPlayer.m_bFriend)
 								IconImage(ICON_MD_GROUP);
@@ -1412,7 +1413,7 @@ void CMenu::MenuLogs(int iTab)
 									I::SteamFriends->ActivateGameOverlayToWebPage(std::format("https://steamhistory.net/id/{}", CSteamID(tPlayer.m_uAccountID, k_EUniversePublic, k_EAccountTypeIndividual).ConvertToUint64()).c_str());
 							}
 
-							if (FSelectable(F::Spectate.m_iIntendedTarget == tPlayer.m_iUserID ? "Unspectate" : "Spectate"))
+							if (FSelectable(F::Spectate.GetTarget(true) == tPlayer.m_iUserID ? "Unspectate" : "Spectate"))
 								F::Spectate.SetTarget(tPlayer.m_iUserID);
 
 							if (!I::EngineClient->IsPlayingDemo() && FBeginMenu("Votekick"))

Amalgam/src/Features/Players/PlayerUtils.cpp

@@ -382,17 +382,17 @@ const char* CPlayerlistUtils::GetPlayerName(int iIndex, const char* sDefault, in
 	switch (iType)
 	{
 	case NameTypeEnum::Local:
-		return "Local";
+		return LOCAL;
 	case NameTypeEnum::Friend:
-		return "Friend";
+		return FRIEND;
 	case NameTypeEnum::Party:
-		return "Party";
+		return PARTY;
 	case NameTypeEnum::Player:
 		if (auto pTag = GetSignificantTag(iIndex, 0))
 			return pTag->m_sName.c_str();
 		else if (auto pResource = H::Entities.GetResource(); pResource && pResource->m_bValid(iIndex))
-			return pResource->m_iTeam(I::EngineClient->GetLocalPlayer()) != pResource->m_iTeam(iIndex) ? "Enemy" : "Teammate";
-		return "Player";
+			return pResource->m_iTeam(I::EngineClient->GetLocalPlayer()) != pResource->m_iTeam(iIndex) ? ENEMY : TEAMMATE;
+		return PLAYER;
 	case NameTypeEnum::Custom:
 		if (auto sAlias = GetPlayerAlias(GetAccountID(iIndex)))
 			return sAlias->c_str();
@@ -408,17 +408,17 @@ const char* CPlayerlistUtils::GetPlayerName(uint32_t uAccountID, const char* sDe
 	switch (iType)
 	{
 	case NameTypeEnum::Local:
-		return "Local";
+		return LOCAL;
 	case NameTypeEnum::Friend:
-		return "Friend";
+		return FRIEND;
 	case NameTypeEnum::Party:
-		return "Party";
+		return PARTY;
 	case NameTypeEnum::Player:
 		if (auto pTag = GetSignificantTag(uAccountID, 0))
 			return pTag->m_sName.c_str();
 		else if (auto pResource = H::Entities.GetResource(); (iType = GetIndex(uAccountID)) && pResource && pResource->m_bValid(iType))
-			return pResource->m_iTeam(I::EngineClient->GetLocalPlayer()) != pResource->m_iTeam(iType) ? "Enemy" : "Teammate";
-		return "Player";
+			return pResource->m_iTeam(I::EngineClient->GetLocalPlayer()) != pResource->m_iTeam(iType) ? ENEMY : TEAMMATE;
+		return PLAYER;
 	case NameTypeEnum::Custom:
 		if (auto sAlias = GetPlayerAlias(uAccountID))
 			return sAlias->c_str();

Amalgam/src/Features/Players/PlayerUtils.h

@@ -9,6 +9,13 @@
 #define F2P_TAG (PARTY_TAG-1)
 #define TAG_COUNT (-F2P_TAG)
 
+#define LOCAL "Local"
+#define FRIEND "Friend"
+#define PARTY "Party"
+#define ENEMY "Enemy"
+#define TEAMMATE "Teammate"
+#define PLAYER "Player"
+
 struct ListPlayer
 {
 	std::string m_sName;

Amalgam/src/Features/Simulation/ProjectileSimulation/ProjectileSimulation.cpp

@@ -6,7 +6,7 @@
 
 bool CProjectileSimulation::GetInfoMain(CTFPlayer* pPlayer, CTFWeaponBase* pWeapon, Vec3 vAngles, ProjectileInfo& tProjInfo, int iFlags, float flAutoCharge)
 {
-	if (!pPlayer || !pPlayer->IsAlive() || pPlayer->IsAGhost() || pPlayer->IsTaunting() || !pWeapon)
+	if (!pWeapon || !pPlayer->IsAlive() || pPlayer->IsAGhost() || pPlayer->IsTaunting())
 		return false;
 
 	static auto sv_gravity = H::ConVars.FindVar("sv_gravity");
@@ -287,11 +287,17 @@ bool CProjectileSimulation::GetInfo(CTFPlayer* pPlayer, CTFWeaponBase* pWeapon,
 {
 	bool bInitCheck = iFlags & ProjSimEnum::InitCheck;
 	bool bInterp = iFlags & ProjSimEnum::Interp;
+	bool bReturn = false;
 
-	const float flOldCurrentTime = I::GlobalVars->curtime;
-	I::GlobalVars->curtime = TICKS_TO_TIME(pPlayer->m_nTickBase());
-	bool bReturn = GetInfoMain(pPlayer, pWeapon, vAngles, tProjInfo, iFlags, flAutoCharge);
-	I::GlobalVars->curtime = flOldCurrentTime;
+	if (auto pLocal = bInterp ? H::Entities.GetLocal() : nullptr)
+	{
+		const float flOldCurrentTime = I::GlobalVars->curtime;
+		I::GlobalVars->curtime = TICKS_TO_TIME(pLocal->m_nTickBase());
+		bReturn = GetInfoMain(pPlayer, pWeapon, vAngles, tProjInfo, iFlags, flAutoCharge);
+		I::GlobalVars->curtime = flOldCurrentTime;
+	}
+	else
+		bReturn = GetInfoMain(pPlayer, pWeapon, vAngles, tProjInfo, iFlags, flAutoCharge);
 	tProjInfo.m_iFlags = iFlags;
 
 	if (!bReturn || !bInitCheck)
@@ -627,6 +633,9 @@ Vec3 CProjectileSimulation::GetVelocity()
 
 float CProjectileSimulation::GetDesync()
 {
+	if (I::EngineClient->IsPlayingDemo())
+		return 0.f;
+
 	return I::GlobalVars->curtime - TICKS_TO_TIME(I::ClientState->m_ClockDriftMgr.m_nServerTick) - F::Backtrack.GetReal();
 }
 

Amalgam/src/Features/Spectate/Spectate.cpp

@@ -1,5 +1,10 @@
 #include "Spectate.h"
 
+void CSpectate::Reset()
+{
+	m_iIntendedTarget = m_iTarget = -1;
+}
+
 void CSpectate::NetUpdateEnd(CTFPlayer* pLocal)
 {
 	if (!pLocal)
@@ -39,9 +44,6 @@ void CSpectate::NetUpdateEnd(CTFPlayer* pLocal)
 	}
 	pLocal->m_iObserverMode() = Vars::Visuals::Thirdperson::Enabled.Value ? OBS_MODE_THIRDPERSON : OBS_MODE_FIRSTPERSON;
 	Vars::Visuals::Thirdperson::Enabled.Value ? I::Input->CAM_ToThirdPerson() : I::Input->CAM_ToFirstPerson();
-
-	m_hTargetTarget = pLocal->m_hObserverTarget();
-	m_iTargetMode = pLocal->m_iObserverMode();
 }
 
 void CSpectate::NetUpdateStart(CTFPlayer* pLocal)
@@ -75,4 +77,9 @@ void CSpectate::CreateMove(CUserCmd* pCmd)
 void CSpectate::SetTarget(int iTarget)
 {
 	m_iIntendedTarget = m_iIntendedTarget == iTarget ? -1 : iTarget;
+}
+
+int CSpectate::GetTarget(bool bIntended)
+{
+	return bIntended ? m_iIntendedTarget : m_iTarget;
 }

Amalgam/src/Features/Spectate/Spectate.h

@@ -3,22 +3,24 @@
 
 class CSpectate
 {
+private:
+	int m_iTarget = -1;
+	int m_iIntendedTarget = -1;
+
 public:
 	void NetUpdateEnd(CTFPlayer* pLocal);
 	void NetUpdateStart(CTFPlayer* pLocal);
 	void CreateMove(CUserCmd* pCmd);
-	void SetTarget(int iTarget);
-
-	inline bool HasTarget() { return m_iTarget != -1; }
+	void Reset();
 
-	int m_iTarget = -1;
-	int m_iIntendedTarget = -1;
-	Vec3 m_vOldView = {}; // don't let spectating change viewangles
+	void SetTarget(int iTarget);
+	int GetTarget(bool bIntended = false);
+	inline bool HasTarget(bool bIntended = false) { return (bIntended ? m_iIntendedTarget : m_iTarget) != -1; }
 
 	EHANDLE m_hOriginalTarget;
 	int m_iOriginalMode = OBS_MODE_NONE;
-	EHANDLE m_hTargetTarget;
-	int m_iTargetMode = OBS_MODE_NONE;
+
+	Vec3 m_vOldView = {}; // don't let spectating change viewangles
 };
 
 ADD_FEATURE(CSpectate, Spectate);

Amalgam/src/Features/Visuals/Chams/Chams.cpp

@@ -5,15 +5,25 @@
 #include "../FakeAngle/FakeAngle.h"
 #include "../../Backtrack/Backtrack.h"
 
-void CChams::DrawModel(CBaseEntity* pEntity, Chams_t& tChams, IMatRenderContext* pRenderContext, bool bTwoModels)
+void CChams::Begin()
 {
-	const auto& vVisibleMaterials = !tChams.Visible.empty() ? tChams.Visible : std::vector<std::pair<std::string, Color_t>> { { "None", {} } };
-	const auto& vOccludedMaterials = !tChams.Occluded.empty() ? tChams.Occluded : std::vector<std::pair<std::string, Color_t>> { { "None", {} } };
-
 	m_tOriginalColor = I::RenderView->GetColorModulation();
 	m_flOriginalBlend = I::RenderView->GetBlend();
 	I::ModelRender->GetMaterialOverride(&m_pOriginalMaterial, &m_iOriginalOverride);
+}
+void CChams::End()
+{
+	I::RenderView->SetColorModulation(m_tOriginalColor);
+	I::RenderView->SetBlend(m_flOriginalBlend);
+	I::ModelRender->ForcedMaterialOverride(m_pOriginalMaterial, m_iOriginalOverride);
+}
 
+void CChams::DrawModel(CBaseEntity* pEntity, Chams_t& tChams, IMatRenderContext* pRenderContext, bool bTwoModels)
+{
+	const auto& vVisibleMaterials = !tChams.Visible.empty() ? tChams.Visible : std::vector<std::pair<std::string, Color_t>> { { "None", {} } };
+	const auto& vOccludedMaterials = !tChams.Occluded.empty() ? tChams.Occluded : std::vector<std::pair<std::string, Color_t>> { { "None", {} } };
+
+	Begin();
 	if (bTwoModels)
 	{
 		pRenderContext->SetStencilEnable(true);
@@ -77,10 +87,7 @@ void CChams::DrawModel(CBaseEntity* pEntity, Chams_t& tChams, IMatRenderContext*
 
 		m_mEntities[pEntity->entindex()];
 	}
-
-	I::RenderView->SetColorModulation(m_tOriginalColor);
-	I::RenderView->SetBlend(m_flOriginalBlend);
-	I::ModelRender->ForcedMaterialOverride(m_pOriginalMaterial, m_iOriginalOverride);
+	End();
 }
 
 
@@ -161,8 +168,6 @@ void CChams::RenderBacktrack(const DrawModelState_t& pState, const ModelRenderIn
 	if (!pEntity || !pEntity->IsPlayer())
 		return;
 
-
-
 	std::vector<TickRecord*> vRecords = {};
 	if (!F::Backtrack.GetRecords(pEntity, vRecords))
 		return;
@@ -214,11 +219,9 @@ void CChams::RenderBacktrack(const DrawModelState_t& pState, const ModelRenderIn
 }
 void CChams::RenderFakeAngle(const DrawModelState_t& pState, const ModelRenderInfo_t& pInfo)
 {
-	auto pRenderContext = I::MaterialSystem->GetRenderContext();
-	if (!pRenderContext)
-		return;
-
-
+	//auto pRenderContext = I::MaterialSystem->GetRenderContext();
+	//if (!pRenderContext)
+	//	return;
 
 	//pRenderContext->DepthRange(0.f, Vars::Chams::FakeAngle::IgnoreZ.Value ? 0.2f : 1.f);
 
@@ -252,16 +255,11 @@ bool CChams::RenderViewmodel(void* ecx, int flags, int* iReturn)
 	if (!pRenderContext)
 		return false;
 
-
-
 	Group_t* pGroup = nullptr;
 	if (!F::Groups.GetGroup(TargetsEnum::ViewmodelWeapon, pGroup) || !pGroup->m_tChams(true))
 		return false;
 
-	m_tOriginalColor = I::RenderView->GetColorModulation();
-	m_flOriginalBlend = I::RenderView->GetBlend();
-	I::ModelRender->GetMaterialOverride(&m_pOriginalMaterial, &m_iOriginalOverride);
-
+	Begin();
 	for (auto& [sName, tColor] : pGroup->m_tChams.Visible)
 	{
 		auto pMaterial = F::Materials.GetMaterial(FNV1A::Hash32(sName.c_str()));
@@ -278,10 +276,7 @@ bool CChams::RenderViewmodel(void* ecx, int flags, int* iReturn)
 		if (pMaterial && pMaterial->m_bInvertCull)
 			pRenderContext->CullMode(G::FlipViewmodels ? MATERIAL_CULLMODE_CW : MATERIAL_CULLMODE_CCW);
 	}
-
-	I::RenderView->SetColorModulation(m_tOriginalColor);
-	I::RenderView->SetBlend(m_flOriginalBlend);
-	I::ModelRender->ForcedMaterialOverride(m_pOriginalMaterial, m_iOriginalOverride);
+	End();
 
 	return true;
 }
@@ -294,16 +289,11 @@ bool CChams::RenderViewmodel(const DrawModelState_t& pState, const ModelRenderIn
 	if (!pRenderContext)
 		return false;
 
-
-
 	Group_t* pGroup = nullptr;
 	if (!F::Groups.GetGroup(TargetsEnum::ViewmodelHands, pGroup) || !pGroup->m_tChams(true))
 		return false;
 
-	m_tOriginalColor = I::RenderView->GetColorModulation();
-	m_flOriginalBlend = I::RenderView->GetBlend();
-	I::ModelRender->GetMaterialOverride(&m_pOriginalMaterial, &m_iOriginalOverride);
-
+	Begin();
 	for (auto& [sName, tColor] : pGroup->m_tChams.Visible)
 	{
 		auto pMaterial = F::Materials.GetMaterial(FNV1A::Hash32(sName.c_str()));
@@ -320,10 +310,7 @@ bool CChams::RenderViewmodel(const DrawModelState_t& pState, const ModelRenderIn
 		if (pMaterial && pMaterial->m_bInvertCull)
 			pRenderContext->CullMode(G::FlipViewmodels ? MATERIAL_CULLMODE_CW : MATERIAL_CULLMODE_CCW);
 	}
-
-	I::RenderView->SetColorModulation(m_tOriginalColor);
-	I::RenderView->SetBlend(m_flOriginalBlend);
-	I::ModelRender->ForcedMaterialOverride(m_pOriginalMaterial, m_iOriginalOverride);
+	End();
 
 	return true;
 }

Amalgam/src/Features/Visuals/Chams/Chams.h

@@ -4,6 +4,9 @@
 class CChams
 {
 private:
+	void Begin();
+	void End();
+
 	void DrawModel(CBaseEntity* pEntity, Chams_t& tChams, IMatRenderContext* pRenderContext, bool bTwoModels = true);
 
 	void RenderBacktrack(const DrawModelState_t& pState, const ModelRenderInfo_t& pInfo);