Predict weapon crosshair (ddnet#11671)

Learath2 · web-flow · commit 0ec204b16c40 · 2026-01-24T13:15:06.000Z
diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp
@@ -615,7 +615,7 @@ void CHud::RenderCursor()
 	if(Client()->State() != IClient::STATE_DEMOPLAYBACK && GameClient()->m_Snap.m_pLocalCharacter)
 	{
 		// Render local cursor
-		CurWeapon = maximum(0, GameClient()->m_Snap.m_pLocalCharacter->m_Weapon % NUM_WEAPONS);
+		CurWeapon = maximum(0, GameClient()->m_aClients[GameClient()->m_Snap.m_LocalClientId].m_Predicted.m_ActiveWeapon);
 		TargetPos = GameClient()->m_Controls.m_aTargetPos[g_Config.m_ClDummy];
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ void CHud::RenderCursor()`
`615`	`615`	`if(Client()->State() != IClient::STATE_DEMOPLAYBACK && GameClient()->m_Snap.m_pLocalCharacter)`
`616`	`616`	`{`
`617`	`617`	`// Render local cursor`
`618`		`- CurWeapon = maximum(0, GameClient()->m_Snap.m_pLocalCharacter->m_Weapon % NUM_WEAPONS);`
	`618`	`+ CurWeapon = maximum(0, GameClient()->m_aClients[GameClient()->m_Snap.m_LocalClientId].m_Predicted.m_ActiveWeapon);`
`619`	`619`	`TargetPos = GameClient()->m_Controls.m_aTargetPos[g_Config.m_ClDummy];`
`620`	`620`	`}`
`621`	`621`	`else`