Merge pull request #13 from dumbasPL/cs2

08.12.2023

sdk/!GlobalTypes.hpp

@@ -5,7 +5,7 @@
 // /////////////////////////////////////////////////////////////
 // Binary: !GlobalTypes
 // Classes count: 1294
-// Enums count: 304
+// Enums count: 303
 // Created using source2gen - github.com/neverlosecc/source2gen
 // /////////////////////////////////////////////////////////////
 
@@ -4669,16 +4669,6 @@ enum class LessonPanelLayoutFileTypes_t : uint32_t
 	LAYOUT_CUSTOM = 0x2,
 };
 
-// Registered binary: server.dll (project 'server')
-// Alignment: 4
-// Size: 0x3
-enum class EGrenadeThrowState : uint32_t
-{
-	NotThrowing = 0x0,
-	Throwing = 0x1,
-	ThrowComplete = 0x2,
-};
-
 // Registered binary: server.dll (project 'server')
 // Alignment: 4
 // Size: 0x2
@@ -5367,7 +5357,7 @@ public:
 // Has Trivial Constructor
 // Has Trivial Destructor
 // 
-// MResourceTypeForInfoType "vcompmat@Ôhû"
+// MResourceTypeForInfoType "vcompmat@êgù"
 class InfoForResourceTypeCCompositeMaterialKit
 {
 private:
@@ -30081,12 +30071,12 @@ public:
 
 // Registered binary: server.dll (project 'server')
 // Alignment: 8
-// Size: 0x5f8
+// Size: 0x608
 // Has VTable
 class CCSGOPlayerAnimGraphState
 {
 private:
-	[[maybe_unused]] uint8_t __pad0000[0x5f8]; // 0x0
+	[[maybe_unused]] uint8_t __pad0000[0x608]; // 0x0
 public:
 	// No schema binary for binding
 };

sdk/client.hpp

@@ -12025,121 +12025,121 @@ public:
 	CUtlVector< HSequence > m_thirdPersonFireSequences; // 0x15f8	
 	HSequence m_hCurrentThirdPersonSequence; // 0x1610	
 	int32_t m_nSilencerBoneIndex; // 0x1614	
-	HSequence m_thirdPersonSequences[6]; // 0x1618	
+	HSequence m_thirdPersonSequences[7]; // 0x1618	
 private:
-	[[maybe_unused]] uint8_t __pad1630[0x18]; // 0x1630
+	[[maybe_unused]] uint8_t __pad1634[0x1c]; // 0x1634
 public:
-	CSWeaponState_t m_ClientPreviousWeaponState; // 0x1648	
+	CSWeaponState_t m_ClientPreviousWeaponState; // 0x1650	
 	// MNetworkEnable
 	// MNetworkChangeCallback "OnWeaponStateNetworkChange"
-	CSWeaponState_t m_iState; // 0x164c	
-	float m_flCrosshairDistance; // 0x1650	
-	int32_t m_iAmmoLastCheck; // 0x1654	
-	int32_t m_iAlpha; // 0x1658	
-	int32_t m_iScopeTextureID; // 0x165c	
-	int32_t m_iCrosshairTextureID; // 0x1660	
-	float m_flGunAccuracyPosition; // 0x1664	
+	CSWeaponState_t m_iState; // 0x1654	
+	float m_flCrosshairDistance; // 0x1658	
+	int32_t m_iAmmoLastCheck; // 0x165c	
+	int32_t m_iAlpha; // 0x1660	
+	int32_t m_iScopeTextureID; // 0x1664	
+	int32_t m_iCrosshairTextureID; // 0x1668	
+	float m_flGunAccuracyPosition; // 0x166c	
 	// MNetworkEnable
 	// MNetworkUserGroup "LocalWeaponExclusive"
-	uint32_t m_nViewModelIndex; // 0x1668	
-	bool m_bReloadsWithClips; // 0x166c	
+	uint32_t m_nViewModelIndex; // 0x1670	
+	bool m_bReloadsWithClips; // 0x1674	
 private:
-	[[maybe_unused]] uint8_t __pad166d[0x3]; // 0x166d
+	[[maybe_unused]] uint8_t __pad1675[0x3]; // 0x1675
 public:
 	// MNetworkEnable
 	// MNetworkUserGroup "LocalWeaponExclusive"
 	// MNetworkPriority "32"
-	GameTime_t m_flTimeWeaponIdle; // 0x1670	
-	bool m_bFireOnEmpty; // 0x1674	
+	GameTime_t m_flTimeWeaponIdle; // 0x1678	
+	bool m_bFireOnEmpty; // 0x167c	
 private:
-	[[maybe_unused]] uint8_t __pad1675[0x3]; // 0x1675
+	[[maybe_unused]] uint8_t __pad167d[0x3]; // 0x167d
 public:
-	CEntityIOOutput m_OnPlayerPickup; // 0x1678	
+	CEntityIOOutput m_OnPlayerPickup; // 0x1680	
 	// MNetworkEnable
-	CSWeaponMode m_weaponMode; // 0x16a0	
-	float m_flTurningInaccuracyDelta; // 0x16a4	
-	Vector m_vecTurningInaccuracyEyeDirLast; // 0x16a8	
-	float m_flTurningInaccuracy; // 0x16b4	
+	CSWeaponMode m_weaponMode; // 0x16a8	
+	float m_flTurningInaccuracyDelta; // 0x16ac	
+	Vector m_vecTurningInaccuracyEyeDirLast; // 0x16b0	
+	float m_flTurningInaccuracy; // 0x16bc	
 	// MNetworkEnable
-	float m_fAccuracyPenalty; // 0x16b8	
-	GameTime_t m_flLastAccuracyUpdateTime; // 0x16bc	
-	float m_fAccuracySmoothedForZoom; // 0x16c0	
-	GameTime_t m_fScopeZoomEndTime; // 0x16c4	
+	float m_fAccuracyPenalty; // 0x16c0	
+	GameTime_t m_flLastAccuracyUpdateTime; // 0x16c4	
+	float m_fAccuracySmoothedForZoom; // 0x16c8	
+	GameTime_t m_fScopeZoomEndTime; // 0x16cc	
 	// MNetworkEnable
-	int32_t m_iRecoilIndex; // 0x16c8	
+	int32_t m_iRecoilIndex; // 0x16d0	
 	// MNetworkEnable
-	float m_flRecoilIndex; // 0x16cc	
+	float m_flRecoilIndex; // 0x16d4	
 	// MNetworkEnable
-	bool m_bBurstMode; // 0x16d0	
+	bool m_bBurstMode; // 0x16d8	
 private:
-	[[maybe_unused]] uint8_t __pad16d1[0x3]; // 0x16d1
+	[[maybe_unused]] uint8_t __pad16d9[0x3]; // 0x16d9
 public:
 	// MNetworkEnable
-	GameTick_t m_nPostponeFireReadyTicks; // 0x16d4	
+	GameTick_t m_nPostponeFireReadyTicks; // 0x16dc	
 	// MNetworkEnable
-	float m_flPostponeFireReadyFrac; // 0x16d8	
+	float m_flPostponeFireReadyFrac; // 0x16e0	
 	// MNetworkEnable
-	bool m_bInReload; // 0x16dc	
+	bool m_bInReload; // 0x16e4	
 	// MNetworkEnable
-	bool m_bReloadVisuallyComplete; // 0x16dd	
-private:
-	[[maybe_unused]] uint8_t __pad16de[0x2]; // 0x16de
-public:
-	// MNetworkEnable
-	GameTime_t m_flDroppedAtTime; // 0x16e0	
-	// MNetworkEnable
-	bool m_bIsHauledBack; // 0x16e4	
-	// MNetworkEnable
-	bool m_bSilencerOn; // 0x16e5	
+	bool m_bReloadVisuallyComplete; // 0x16e5	
 private:
 	[[maybe_unused]] uint8_t __pad16e6[0x2]; // 0x16e6
 public:
 	// MNetworkEnable
-	GameTime_t m_flTimeSilencerSwitchComplete; // 0x16e8	
+	GameTime_t m_flDroppedAtTime; // 0x16e8	
 	// MNetworkEnable
-	int32_t m_iOriginalTeamNumber; // 0x16ec	
-	float m_flNextAttackRenderTimeOffset; // 0x16f0	
+	bool m_bIsHauledBack; // 0x16ec	
+	// MNetworkEnable
+	bool m_bSilencerOn; // 0x16ed	
 private:
-	[[maybe_unused]] uint8_t __pad16f4[0x84]; // 0x16f4
-public:
-	bool m_bVisualsDataSet; // 0x1778	
-	bool m_bOldFirstPersonSpectatedState; // 0x1779	
-private:
-	[[maybe_unused]] uint8_t __pad177a[0x2]; // 0x177a
-public:
-	CHandle< C_BaseEntity > m_hOurPing; // 0x177c	
-	CEntityIndex m_nOurPingIndex; // 0x1780	
-	Vector m_vecOurPingPos; // 0x1784	
-	bool m_bGlowForPing; // 0x1790	
-	bool m_bUIWeapon; // 0x1791	
-private:
-	[[maybe_unused]] uint8_t __pad1792[0xe]; // 0x1792
+	[[maybe_unused]] uint8_t __pad16ee[0x2]; // 0x16ee
 public:
 	// MNetworkEnable
-	CHandle< C_CSPlayerPawn > m_hPrevOwner; // 0x17a0	
+	GameTime_t m_flTimeSilencerSwitchComplete; // 0x16f0	
 	// MNetworkEnable
-	GameTick_t m_nDropTick; // 0x17a4	
+	int32_t m_iOriginalTeamNumber; // 0x16f4	
+	float m_flNextAttackRenderTimeOffset; // 0x16f8	
 private:
-	[[maybe_unused]] uint8_t __pad17a8[0x1c]; // 0x17a8
+	[[maybe_unused]] uint8_t __pad16fc[0x84]; // 0x16fc
 public:
-	bool m_donated; // 0x17c4	
+	bool m_bVisualsDataSet; // 0x1780	
+	bool m_bOldFirstPersonSpectatedState; // 0x1781	
 private:
-	[[maybe_unused]] uint8_t __pad17c5[0x3]; // 0x17c5
+	[[maybe_unused]] uint8_t __pad1782[0x2]; // 0x1782
+public:
+	CHandle< C_BaseEntity > m_hOurPing; // 0x1784	
+	CEntityIndex m_nOurPingIndex; // 0x1788	
+	Vector m_vecOurPingPos; // 0x178c	
+	bool m_bGlowForPing; // 0x1798	
+	bool m_bUIWeapon; // 0x1799	
+private:
+	[[maybe_unused]] uint8_t __pad179a[0xe]; // 0x179a
 public:
 	// MNetworkEnable
-	GameTime_t m_fLastShotTime; // 0x17c8	
-	bool m_bWasOwnedByCT; // 0x17cc	
-	bool m_bWasOwnedByTerrorist; // 0x17cd	
+	CHandle< C_CSPlayerPawn > m_hPrevOwner; // 0x17a8	
+	// MNetworkEnable
+	GameTick_t m_nDropTick; // 0x17ac	
 private:
-	[[maybe_unused]] uint8_t __pad17ce[0x2]; // 0x17ce
+	[[maybe_unused]] uint8_t __pad17b0[0x1c]; // 0x17b0
 public:
-	float m_gunHeat; // 0x17d0	
-	uint32_t m_smokeAttachments; // 0x17d4	
-	GameTime_t m_lastSmokeTime; // 0x17d8	
-	float m_flNextClientFireBulletTime; // 0x17dc	
-	float m_flNextClientFireBulletTime_Repredict; // 0x17e0	
+	bool m_donated; // 0x17cc	
 private:
-	[[maybe_unused]] uint8_t __pad17e4[0xdc]; // 0x17e4
+	[[maybe_unused]] uint8_t __pad17cd[0x3]; // 0x17cd
+public:
+	// MNetworkEnable
+	GameTime_t m_fLastShotTime; // 0x17d0	
+	bool m_bWasOwnedByCT; // 0x17d4	
+	bool m_bWasOwnedByTerrorist; // 0x17d5	
+private:
+	[[maybe_unused]] uint8_t __pad17d6[0x2]; // 0x17d6
+public:
+	float m_gunHeat; // 0x17d8	
+	uint32_t m_smokeAttachments; // 0x17dc	
+	GameTime_t m_lastSmokeTime; // 0x17e0	
+	float m_flNextClientFireBulletTime; // 0x17e4	
+	float m_flNextClientFireBulletTime_Repredict; // 0x17e8	
+private:
+	[[maybe_unused]] uint8_t __pad17ec[0xd4]; // 0x17ec
 public:
 	C_IronSightController m_IronSightController; // 0x18c0	
 	// MNetworkEnable
@@ -12420,13 +12420,15 @@ public:
 // MNetworkVarNames "bool m_bIsHeldByPlayer"
 // MNetworkVarNames "bool m_bPinPulled"
 // MNetworkVarNames "bool m_bJumpThrow"
-// MNetworkVarNames "EGrenadeThrowState m_eThrowStatus"
+// MNetworkVarNames "bool m_bThrowAnimating"
 // MNetworkVarNames "GameTime_t m_fThrowTime"
 // MNetworkVarNames "float m_flThrowStrength"
 // MNetworkVarNames "float m_flThrowStrengthApproach"
 // MNetworkVarNames "GameTime_t m_fDropTime"
+// MNetworkVarNames "bool m_bJustPulledPin"
 // MNetworkVarNames "GameTick_t m_nNextHoldTick"
 // MNetworkVarNames "float m_flNextHoldFrac"
+// MNetworkVarNames "CHandle< CCSWeaponBase> m_hSwitchToWeaponAfterThrow"
 class C_BaseCSGrenade : public C_CSWeaponBase
 {
 public:
@@ -12441,23 +12443,30 @@ public:
 	bool m_bPinPulled; // 0x1a03	
 	// MNetworkEnable
 	bool m_bJumpThrow; // 0x1a04	
+	// MNetworkEnable
+	bool m_bThrowAnimating; // 0x1a05	
 private:
-	[[maybe_unused]] uint8_t __pad1a05[0x3]; // 0x1a05
+	[[maybe_unused]] uint8_t __pad1a06[0x2]; // 0x1a06
 public:
 	// MNetworkEnable
-	EGrenadeThrowState m_eThrowStatus; // 0x1a08	
+	GameTime_t m_fThrowTime; // 0x1a08	
 	// MNetworkEnable
-	GameTime_t m_fThrowTime; // 0x1a0c	
+	float m_flThrowStrength; // 0x1a0c	
 	// MNetworkEnable
-	float m_flThrowStrength; // 0x1a10	
+	float m_flThrowStrengthApproach; // 0x1a10	
 	// MNetworkEnable
-	float m_flThrowStrengthApproach; // 0x1a14	
+	GameTime_t m_fDropTime; // 0x1a14	
 	// MNetworkEnable
-	GameTime_t m_fDropTime; // 0x1a18	
+	bool m_bJustPulledPin; // 0x1a18	
+private:
+	[[maybe_unused]] uint8_t __pad1a19[0x3]; // 0x1a19
+public:
 	// MNetworkEnable
 	GameTick_t m_nNextHoldTick; // 0x1a1c	
 	// MNetworkEnable
 	float m_flNextHoldFrac; // 0x1a20	
+	// MNetworkEnable
+	CHandle< C_CSWeaponBase > m_hSwitchToWeaponAfterThrow; // 0x1a24	
 };
 
 // Registered binary: client.dll (project 'client')
@@ -13025,7 +13034,7 @@ public:
 
 // Registered binary: client.dll (project 'client')
 // Alignment: 8
-// Size: 0x23a0
+// Size: 0x23b0
 // Has VTable
 // 
 // MPulseBindableTarget
@@ -13198,20 +13207,20 @@ public:
 	// MNetworkEnable
 	Vector m_vRagdollServerOrigin; // 0x1d64	
 private:
-	[[maybe_unused]] uint8_t __pad1d70[0x5f8]; // 0x1d70
+	[[maybe_unused]] uint8_t __pad1d70[0x608]; // 0x1d70
 public:
-	bool m_bLastHeadBoneTransformIsValid; // 0x2368	
+	bool m_bLastHeadBoneTransformIsValid; // 0x2378	
 private:
-	[[maybe_unused]] uint8_t __pad2369[0x3]; // 0x2369
+	[[maybe_unused]] uint8_t __pad2379[0x3]; // 0x2379
 public:
-	GameTime_t m_lastLandTime; // 0x236c	
-	bool m_bOnGroundLastTick; // 0x2370	
+	GameTime_t m_lastLandTime; // 0x237c	
+	bool m_bOnGroundLastTick; // 0x2380	
 private:
-	[[maybe_unused]] uint8_t __pad2371[0x1b]; // 0x2371
+	[[maybe_unused]] uint8_t __pad2381[0x1b]; // 0x2381
 public:
 	// MNetworkEnable
-	QAngle m_qDeathEyeAngles; // 0x238c	
-	bool m_bSkipOneHeadConstraintUpdate; // 0x2398	
+	QAngle m_qDeathEyeAngles; // 0x239c	
+	bool m_bSkipOneHeadConstraintUpdate; // 0x23a8	
 };
 
 // Registered binary: client.dll (project 'client')
@@ -13735,7 +13744,7 @@ public:
 
 // Registered binary: client.dll (project 'client')
 // Alignment: 8
-// Size: 0x2438
+// Size: 0x2448
 // Has VTable
 // 
 // MPulseBindableTarget
@@ -13743,14 +13752,14 @@ public:
 class C_CSGO_PreviewPlayer : public C_CSPlayerPawn
 {
 public:
-	CUtlString m_animgraph; // 0x23a0	
-	CUtlString m_animgraphCharacterModeString; // 0x23a8	
-	float m_flInitialModelScale; // 0x23b0	
+	CUtlString m_animgraph; // 0x23b0	
+	CUtlString m_animgraphCharacterModeString; // 0x23b8	
+	float m_flInitialModelScale; // 0x23c0	
 };
 
 // Registered binary: client.dll (project 'client')
 // Alignment: 8
-// Size: 0x2438
+// Size: 0x2448
 // Has VTable
 // 
 // MPulseBindableTarget
@@ -13762,7 +13771,7 @@ public:
 
 // Registered binary: client.dll (project 'client')
 // Alignment: 8
-// Size: 0x2438
+// Size: 0x2448
 // Has VTable
 // 
 // MPulseBindableTarget

sdk/resourcesystem.hpp

@@ -601,7 +601,7 @@ public:
 // Has Trivial Constructor
 // Has Trivial Destructor
 // 
-// MResourceTypeForInfoType "vcompmat@Ôhû"
+// MResourceTypeForInfoType "vcompmat@êgù"
 class InfoForResourceTypeCCompositeMaterialKit
 {
 private: