From 6715c25b37cafd7c33f967034dc0e2b2cda9114e Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 3 Aug 2024 14:21:11 +0200 Subject: [PATCH] Client: add reversed C_WeaponX class Partially reversed. --- src/game/CMakeLists.txt | 20 +++++++------ src/game/client/r1/c_weapon_x.h | 50 +++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 src/game/client/r1/c_weapon_x.h diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 1515bff1..e3fe00b6 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -43,6 +43,14 @@ add_sources( SOURCE_GROUP "Player" "shared/player_melee.h" ) +add_sources( SOURCE_GROUP "Weapon" + "shared/r1/weapon_playerdata.h" + "shared/r1/weapon_bolt.cpp" + "shared/r1/weapon_bolt.h" + "shared/r1/grapple.h" + "shared/r1/smartammo.h" +) + add_sources( SOURCE_GROUP "Network" "shared/playernet_vars.h" "shared/usermessages.h" @@ -72,14 +80,6 @@ add_sources( SOURCE_GROUP "Script" "shared/vscript_shared.h" ) -add_sources( SOURCE_GROUP "Weapon" - "shared/r1/weapon_playerdata.h" - "shared/r1/weapon_bolt.cpp" - "shared/r1/weapon_bolt.h" - "shared/r1/grapple.h" - "shared/r1/smartammo.h" -) - endif() if( ${PROJECT_NAME} STREQUAL "server_static" ) @@ -217,6 +217,10 @@ add_sources( SOURCE_GROUP "Player" "client/c_playerlocaldata.h" ) +add_sources( SOURCE_GROUP "Weapon" + "client/r1/c_weapon_x.h" +) + add_sources( SOURCE_GROUP "Input" "client/in_main.cpp" "client/input.cpp" diff --git a/src/game/client/r1/c_weapon_x.h b/src/game/client/r1/c_weapon_x.h new file mode 100644 index 00000000..57a57848 --- /dev/null +++ b/src/game/client/r1/c_weapon_x.h @@ -0,0 +1,50 @@ +#ifndef C_WEAPON_X +#define C_WEAPON_X + +#include "..\c_baseanimating.h" +#include "game/shared/shared_activity.h" +#include "game/shared/r1/weapon_playerdata.h" +#include "game/shared/r1/smartammo.h" + +class C_WeaponX : C_BaseAnimating +{ + EHANDLE m_weaponOwner; + float m_lastPrimaryAttack; + float m_nextReadyTime; + float m_nextPrimaryAttackTime; + float m_attackTimeThisFrame; + int m_worldModelIndexOverride; + int m_iWorldModelIndex; + int m_holsterModelIndex; + int m_droppedModelIndex; + int m_nIdealSequence; + sharedactivity_e m_IdealActivity; + sharedactivity_e m_weaponActivity; + int m_ActiveState; + int m_ammoInClip; + int m_ammoInStockpile; + int m_lifetimeShots; + float m_flTimeWeaponIdle; + int m_weapState; + bool m_allowedToUse; + bool m_discarded; + bool m_bInReload; + char gap_123b[1]; + int m_forcedADS; + char m_tossRelease; + char gap_1241[3]; + sharedactivity_e m_customActivity; + int m_customActivitySequence; + EHANDLE m_customActivityOwner; + float m_customActivityEndTime; + char m_customActivityFlags; + char gap_1255[3]; + WeaponPlayerData_Client m_playerData; + bool m_smartAmmoEnable; + char gap_1339[7]; + SmartAmmo_WeaponData_Client m_smartAmmo; + char unk_pad[560]; + char m_modVars[4432]; +}; + +#endif // C_WEAPON_X