Remove ViewmodelService and uses

- Change flashlight to always use attachment
- Disable EntWatch hud until alternative implementation is added

Author: tilgep

src/cs2_sdk/entity/ccsplayerpawn.h

@@ -42,7 +42,6 @@ class CCSPlayerPawnBase : public CBasePlayerPawn
 	SCHEMA_FIELD(QAngle, m_angEyeAngles)
 	SCHEMA_FIELD(CSPlayerState, m_iPlayerState)
 	SCHEMA_FIELD(CHandle<CCSPlayerController>, m_hOriginalController)
-	SCHEMA_FIELD(CCSPlayer_ViewModelServices*, m_pViewModelServices)
 	SCHEMA_FIELD(CCSPlayer_PingServices*, m_pPingServices)
 
 	CCSPlayerController* GetOriginalController()

src/entwatch.cpp

@@ -1956,9 +1956,14 @@ void CEWHandler::Hook_Use(InputData_t* pInput)
 	RETURN_META(MRES_IGNORED);
 }
 
+// CURRENTLY DISABLED WHILE HUD IS NOT IMPLEMENTED
 // Update cd and uses of all held items
 float EW_UpdateHud()
 {
+	////////////////////////
+	return -1.0f;
+	////////////////////////
+
 	if (!GetGlobals())
 		return EW_HUD_TICKRATE;
 

src/playermanager.cpp

@@ -180,13 +180,6 @@ void ZEPlayer::SpawnFlashLight()
 
 	CCSPlayerPawn* pPawn = (CCSPlayerPawn*)CCSPlayerController::FromSlot(GetPlayerSlot())->GetPawn();
 
-	// Ensure custom viewmodel exists if needed
-	if (!g_cvarFlashLightUseAttachment.Get())
-	{
-		if (!pPawn->m_pViewModelServices() || !GetOrCreateCustomViewModel(pPawn))
-			return;
-	}
-
 	Vector origin = pPawn->GetAbsOrigin();
 	Vector forward;
 	AngleVectors(pPawn->m_angEyeAngles(), &forward);
@@ -214,20 +207,9 @@ void ZEPlayer::SpawnFlashLight()
 	pKeyValues->SetString("lightcookie", "materials/effects/lightcookies/flashlight.vtex");
 
 	pLight->DispatchSpawn(pKeyValues);
-
-	if (g_cvarFlashLightUseAttachment.Get())
-	{
-		pLight->SetParent(pPawn);
-		pLight->AcceptInput("SetParentAttachmentMaintainOffset", g_cvarFlashLightAttachment.Get().String());
-	}
-	else
-	{
-		CBaseViewModel* pViewModel = GetOrCreateCustomViewModel(pPawn);
-		if (!pViewModel)
-			return;
-
-		pLight->SetParent(pViewModel);
-	}
+	
+	pLight->SetParent(pPawn);
+	pLight->AcceptInput("SetParentAttachmentMaintainOffset", g_cvarFlashLightAttachment.Get().String());
 
 	SetFlashLight(pLight);
 }
@@ -602,42 +584,21 @@ void ZEPlayer::ReplicateConVar(const char* pszName, const char* pszValue)
 	delete data;
 }
 
-CBaseViewModel* ZEPlayer::GetOrCreateCustomViewModel(CCSPlayerPawn* pPawn)
-{
-	CBaseViewModel* pViewmodel = pPawn->m_pViewModelServices()->GetViewModel(2);
-	if (pViewmodel)
-		return pViewmodel;
-
-	pViewmodel = CreateEntityByName<CBaseViewModel>("predicted_viewmodel");
-	if (!pViewmodel)
-		return nullptr;
-
-	pViewmodel->DispatchSpawn();
-	pViewmodel->SetOwner(pPawn);
-	pPawn->m_pViewModelServices()->SetViewModel(2, pViewmodel);
-
-	return pViewmodel;
-}
-
+// CURRENTLY DOES NOTHING 
 void ZEPlayer::CreateEntwatchHud()
 {
+	////////////////////////
+	return;
+	////////////////////////
+
 	CCSPlayerController* pController = CCSPlayerController::FromSlot(GetPlayerSlot());
 	if (!pController)
 		return;
 
 	CCSPlayerPawn* pPawn = pController->GetPlayerPawn();
 	if (!pPawn)
 		return;
-
-	if (!pPawn->m_pViewModelServices())
-		return;
-
-	CBaseViewModel* pViewModel = GetOrCreateCustomViewModel(pPawn);
-	if (!pViewModel)
-	{
-		Panic("Failed to get or create custom viewmodel for entwatch hud.\n");
-		return;
-	}
+	
 
 	CPointWorldText* pText = GetEntwatchHud();
 	if (pText)
@@ -670,10 +631,10 @@ void ZEPlayer::CreateEntwatchHud()
 	pText->DispatchSpawn();
 	SetEntwatchHud(pText);
 
-	pText->AcceptInput("SetParent", "!activator", pViewModel);
+	//pText->AcceptInput("SetParent", "!activator", pViewModel);
 
-	Vector origin = pViewModel->GetAbsOrigin();
-	QAngle vmangles = pViewModel->GetAbsRotation();
+	//Vector origin = pViewModel->GetAbsOrigin();
+	//QAngle vmangles = pViewModel->GetAbsRotation();
 
 	Vector forward;
 	Vector right;

src/playermanager.h

@@ -303,7 +303,6 @@ class ZEPlayer
 	std::shared_ptr<ZRClass> GetActiveZRClass() { return m_pActiveZRClass; }
 	std::shared_ptr<ZRModelEntry> GetActiveZRModel() { return m_pActiveZRModel; }
 	int GetButtonWatchMode();
-	CBaseViewModel* GetOrCreateCustomViewModel(CCSPlayerPawn* pPawn);
 	int GetEntwatchHudMode();
 	bool GetEntwatchClangtags() { return m_bEntwatchClantags; }
 	CPointWorldText* GetEntwatchHud() { return m_hEntwatchHud.Get(); }