From ba4d0c37216f1f0d101d18e56fd6a1f3fcccf9dc Mon Sep 17 00:00:00 2001 From: Yimura Date: Fri, 29 Jul 2022 18:00:22 +0200 Subject: [PATCH] refactor: Reorganize repo (#12) --- CTunables.hpp | 14 -------------- CBaseModelInfo.hpp => base/CBaseModelInfo.hpp | 2 +- CNavigation.hpp => base/CNavigation.hpp | 2 +- HashTable.hpp => base/HashTable.hpp | 0 gtav.rcnet | Bin 17335 -> 27739 bytes misc/CTunables.hpp | 11 +++++++++++ .../CNetGamePlayer.hpp | 6 +++--- .../CNetworkPlayerMgr.hpp | 4 ++-- netObject.hpp => network/netObject.hpp | 0 netPlayer.hpp => network/netPlayer.hpp | 2 +- .../netPlayerData.hpp | 0 CPed.hpp => ped/CPed.hpp | 12 ++++++------ .../CPedAppearanceDataNode.hpp | 4 ++-- CPedComponents.hpp => ped/CPedComponents.hpp | 0 CPedFactory.hpp => ped/CPedFactory.hpp | 2 +- CPedModelInfo.hpp => ped/CPedModelInfo.hpp | 0 .../CPedWeaponManager.hpp | 2 +- .../CNonPhysicalPlayerData.hpp | 2 +- .../CPlayerAppearanceDataNode.hpp | 2 +- CPlayerInfo.hpp => player/CPlayerInfo.hpp | 2 +- atSingleton.hpp => rage/atSingleton.hpp | 0 fwDrawData.hpp => rage/fwDrawData.hpp | 0 fwEntity.hpp => rage/fwEntity.hpp | 8 ++++---- vector.hpp => rage/vector.hpp | 0 FriendInfo.hpp => socialclub/FriendInfo.hpp | 0 .../FriendRegistry.hpp | 2 +- ScInfo.hpp => socialclub/ScInfo.hpp | 0 CAutomobile.hpp => vehicle/CAutomobile.hpp | 8 ++++---- .../CHandlingData.hpp | 2 +- .../CVehicleDrawHandler.hpp | 0 .../CVehicleModelInfo.hpp | 2 +- CAmmoInfo.hpp => weapon/CAmmoInfo.hpp | 2 +- CItemInfo.hpp => weapon/CItemInfo.hpp | 0 CWeaponInfo.hpp => weapon/CWeaponInfo.hpp | 4 ++-- 34 files changed, 46 insertions(+), 49 deletions(-) delete mode 100644 CTunables.hpp rename CBaseModelInfo.hpp => base/CBaseModelInfo.hpp (96%) rename CNavigation.hpp => base/CNavigation.hpp (92%) rename HashTable.hpp => base/HashTable.hpp (100%) create mode 100644 misc/CTunables.hpp rename CNetGamePlayer.hpp => network/CNetGamePlayer.hpp (85%) rename CNetworkPlayerMgr.hpp => network/CNetworkPlayerMgr.hpp (93%) rename netObject.hpp => network/netObject.hpp (100%) rename netPlayer.hpp => network/netPlayer.hpp (91%) rename netPlayerData.hpp => network/netPlayerData.hpp (100%) rename CPed.hpp => ped/CPed.hpp (79%) rename CPedAppearanceDataNode.hpp => ped/CPedAppearanceDataNode.hpp (94%) rename CPedComponents.hpp => ped/CPedComponents.hpp (100%) rename CPedFactory.hpp => ped/CPedFactory.hpp (87%) rename CPedModelInfo.hpp => ped/CPedModelInfo.hpp (100%) rename CPedWeaponManager.hpp => ped/CPedWeaponManager.hpp (92%) rename CNonPhysicalPlayerData.hpp => player/CNonPhysicalPlayerData.hpp (96%) rename CPlayerAppearanceDataNode.hpp => player/CPlayerAppearanceDataNode.hpp (98%) rename CPlayerInfo.hpp => player/CPlayerInfo.hpp (97%) rename atSingleton.hpp => rage/atSingleton.hpp (100%) rename fwDrawData.hpp => rage/fwDrawData.hpp (100%) rename fwEntity.hpp => rage/fwEntity.hpp (89%) rename vector.hpp => rage/vector.hpp (100%) rename FriendInfo.hpp => socialclub/FriendInfo.hpp (100%) rename FriendRegistry.hpp => socialclub/FriendRegistry.hpp (91%) rename ScInfo.hpp => socialclub/ScInfo.hpp (100%) rename CAutomobile.hpp => vehicle/CAutomobile.hpp (89%) rename CHandlingData.hpp => vehicle/CHandlingData.hpp (99%) rename CVehicleDrawHandler.hpp => vehicle/CVehicleDrawHandler.hpp (100%) rename CVehicleModelInfo.hpp => vehicle/CVehicleModelInfo.hpp (98%) rename CAmmoInfo.hpp => weapon/CAmmoInfo.hpp (95%) rename CItemInfo.hpp => weapon/CItemInfo.hpp (100%) rename CWeaponInfo.hpp => weapon/CWeaponInfo.hpp (99%) diff --git a/CTunables.hpp b/CTunables.hpp deleted file mode 100644 index 478067f..0000000 --- a/CTunables.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include - -namespace rage -{ - class CTunables - { - public: - char pad_0000[112]; //0x0000 - uint64_t m_bPtr; //0x0070 - uint16_t m_bCount; //0x0078 - }; //Size: 0x007A -} diff --git a/CBaseModelInfo.hpp b/base/CBaseModelInfo.hpp similarity index 96% rename from CBaseModelInfo.hpp rename to base/CBaseModelInfo.hpp index a3430c8..0a3334e 100644 --- a/CBaseModelInfo.hpp +++ b/base/CBaseModelInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "vector.hpp" +#include "rage/vector.hpp" #include diff --git a/CNavigation.hpp b/base/CNavigation.hpp similarity index 92% rename from CNavigation.hpp rename to base/CNavigation.hpp index db03b85..99031d7 100644 --- a/CNavigation.hpp +++ b/base/CNavigation.hpp @@ -1,6 +1,6 @@ #pragma once -#include "vector.hpp" +#include "rage/vector.hpp" class CNavigation { diff --git a/HashTable.hpp b/base/HashTable.hpp similarity index 100% rename from HashTable.hpp rename to base/HashTable.hpp diff --git a/gtav.rcnet b/gtav.rcnet index 6b7ec7a3d4a781d5f4fdaecced37dbb17c225580..6ed4e9f933a6fde8627462b68f006dd8ccab3edc 100644 GIT binary patch literal 27739 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 diff --git a/misc/CTunables.hpp b/misc/CTunables.hpp new file mode 100644 index 0000000..82c4e5a --- /dev/null +++ b/misc/CTunables.hpp @@ -0,0 +1,11 @@ +#pragma once + +#include + +class CTunables +{ +public: + char pad_0000[112]; //0x0000 + uint64_t m_bPtr; //0x0070 + uint16_t m_bCount; //0x0078 +}; //Size: 0x007A diff --git a/CNetGamePlayer.hpp b/network/CNetGamePlayer.hpp similarity index 85% rename from CNetGamePlayer.hpp rename to network/CNetGamePlayer.hpp index 13a04ac..097bcf0 100644 --- a/CNetGamePlayer.hpp +++ b/network/CNetGamePlayer.hpp @@ -1,9 +1,9 @@ #pragma once -#include "CPlayerInfo.hpp" -#include "CNonPhysicalPlayerData.hpp" +#include "player/CPlayerInfo.hpp" +#include "player/CNonPhysicalPlayerData.hpp" -#include "netPlayer.hpp" +#include "network/netPlayer.hpp" #include diff --git a/CNetworkPlayerMgr.hpp b/network/CNetworkPlayerMgr.hpp similarity index 93% rename from CNetworkPlayerMgr.hpp rename to network/CNetworkPlayerMgr.hpp index 06ca7a4..3fe3536 100644 --- a/CNetworkPlayerMgr.hpp +++ b/network/CNetworkPlayerMgr.hpp @@ -1,7 +1,7 @@ #pragma once -#include "CNetGamePlayer.hpp" -#include "CNonPhysicalPlayerData.hpp" +#include "network/CNetGamePlayer.hpp" +#include "player/CNonPhysicalPlayerData.hpp" #include diff --git a/netObject.hpp b/network/netObject.hpp similarity index 100% rename from netObject.hpp rename to network/netObject.hpp diff --git a/netPlayer.hpp b/network/netPlayer.hpp similarity index 91% rename from netPlayer.hpp rename to network/netPlayer.hpp index f62c6f5..9b615ba 100644 --- a/netPlayer.hpp +++ b/network/netPlayer.hpp @@ -1,6 +1,6 @@ #pragma once -#include "netPlayerData.hpp" +#include "network/netPlayerData.hpp" namespace rage { diff --git a/netPlayerData.hpp b/network/netPlayerData.hpp similarity index 100% rename from netPlayerData.hpp rename to network/netPlayerData.hpp diff --git a/CPed.hpp b/ped/CPed.hpp similarity index 79% rename from CPed.hpp rename to ped/CPed.hpp index ea5edaa..5593258 100644 --- a/CPed.hpp +++ b/ped/CPed.hpp @@ -1,12 +1,12 @@ #pragma once -#include "CAutomobile.hpp" -#include "CPedModelInfo.hpp" -#include "CPedWeaponManager.hpp" -#include "CPlayerInfo.hpp" +#include "vehicle/CAutomobile.hpp" +#include "ped/CPedModelInfo.hpp" +#include "ped/CPedWeaponManager.hpp" +#include "player/CPlayerInfo.hpp" -#include "fwEntity.hpp" -#include "vector.hpp" +#include "rage/fwEntity.hpp" +#include "rage/vector.hpp" #include diff --git a/CPedAppearanceDataNode.hpp b/ped/CPedAppearanceDataNode.hpp similarity index 94% rename from CPedAppearanceDataNode.hpp rename to ped/CPedAppearanceDataNode.hpp index 2e93eb2..2871782 100644 --- a/CPedAppearanceDataNode.hpp +++ b/ped/CPedAppearanceDataNode.hpp @@ -1,6 +1,6 @@ #pragma once -#include "CPedComponents.hpp" +#include "ped/CPedComponents.hpp" #include @@ -33,4 +33,4 @@ public: uint8_t unk_0x1E1; //0x01E1 }; //Size: 0x01E4 static_assert(sizeof(CPedAppearanceDataNode) == 0x1E4); -#pragma(pop) \ No newline at end of file +#pragma(pop) diff --git a/CPedComponents.hpp b/ped/CPedComponents.hpp similarity index 100% rename from CPedComponents.hpp rename to ped/CPedComponents.hpp diff --git a/CPedFactory.hpp b/ped/CPedFactory.hpp similarity index 87% rename from CPedFactory.hpp rename to ped/CPedFactory.hpp index a6bede5..9a4281d 100644 --- a/CPedFactory.hpp +++ b/ped/CPedFactory.hpp @@ -1,6 +1,6 @@ #pragma once -#include "CPed.hpp" +#include "ped/CPed.hpp" class CPedFactory { diff --git a/CPedModelInfo.hpp b/ped/CPedModelInfo.hpp similarity index 100% rename from CPedModelInfo.hpp rename to ped/CPedModelInfo.hpp diff --git a/CPedWeaponManager.hpp b/ped/CPedWeaponManager.hpp similarity index 92% rename from CPedWeaponManager.hpp rename to ped/CPedWeaponManager.hpp index c5602d5..893b6ca 100644 --- a/CPedWeaponManager.hpp +++ b/ped/CPedWeaponManager.hpp @@ -1,6 +1,6 @@ #pragma once -#include "CWeaponInfo.hpp" +#include "weapon/CWeaponInfo.hpp" #include diff --git a/CNonPhysicalPlayerData.hpp b/player/CNonPhysicalPlayerData.hpp similarity index 96% rename from CNonPhysicalPlayerData.hpp rename to player/CNonPhysicalPlayerData.hpp index a3b14c7..d27817a 100644 --- a/CNonPhysicalPlayerData.hpp +++ b/player/CNonPhysicalPlayerData.hpp @@ -1,6 +1,6 @@ #pragma once -#include "vector.hpp" +#include "rage/vector.hpp" #include diff --git a/CPlayerAppearanceDataNode.hpp b/player/CPlayerAppearanceDataNode.hpp similarity index 98% rename from CPlayerAppearanceDataNode.hpp rename to player/CPlayerAppearanceDataNode.hpp index 42d0c3a..e3b3089 100644 --- a/CPlayerAppearanceDataNode.hpp +++ b/player/CPlayerAppearanceDataNode.hpp @@ -1,6 +1,6 @@ #pragma once -#include "CPedComponents.hpp" +#include "ped/CPedComponents.hpp" #include diff --git a/CPlayerInfo.hpp b/player/CPlayerInfo.hpp similarity index 97% rename from CPlayerInfo.hpp rename to player/CPlayerInfo.hpp index 2217d9f..2ab34b1 100644 --- a/CPlayerInfo.hpp +++ b/player/CPlayerInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "netPlayerData.hpp" +#include "network/netPlayerData.hpp" #include diff --git a/atSingleton.hpp b/rage/atSingleton.hpp similarity index 100% rename from atSingleton.hpp rename to rage/atSingleton.hpp diff --git a/fwDrawData.hpp b/rage/fwDrawData.hpp similarity index 100% rename from fwDrawData.hpp rename to rage/fwDrawData.hpp diff --git a/fwEntity.hpp b/rage/fwEntity.hpp similarity index 89% rename from fwEntity.hpp rename to rage/fwEntity.hpp index 3c98701..9f381ef 100644 --- a/fwEntity.hpp +++ b/rage/fwEntity.hpp @@ -1,10 +1,10 @@ #pragma once -#include "CBaseModelInfo.hpp" -#include "CNavigation.hpp" +#include "base/CBaseModelInfo.hpp" +#include "base/CNavigation.hpp" -#include "fwDrawData.hpp" -#include "netObject.hpp" +#include "rage/fwDrawData.hpp" +#include "network/netObject.hpp" #include diff --git a/vector.hpp b/rage/vector.hpp similarity index 100% rename from vector.hpp rename to rage/vector.hpp diff --git a/FriendInfo.hpp b/socialclub/FriendInfo.hpp similarity index 100% rename from FriendInfo.hpp rename to socialclub/FriendInfo.hpp diff --git a/FriendRegistry.hpp b/socialclub/FriendRegistry.hpp similarity index 91% rename from FriendRegistry.hpp rename to socialclub/FriendRegistry.hpp index 7b18413..d68ca93 100644 --- a/FriendRegistry.hpp +++ b/socialclub/FriendRegistry.hpp @@ -1,6 +1,6 @@ #pragma once -#include "FriendInfo.hpp" +#include "socialclub/FriendInfo.hpp" #include diff --git a/ScInfo.hpp b/socialclub/ScInfo.hpp similarity index 100% rename from ScInfo.hpp rename to socialclub/ScInfo.hpp diff --git a/CAutomobile.hpp b/vehicle/CAutomobile.hpp similarity index 89% rename from CAutomobile.hpp rename to vehicle/CAutomobile.hpp index 324a102..4060034 100644 --- a/CAutomobile.hpp +++ b/vehicle/CAutomobile.hpp @@ -1,10 +1,10 @@ #pragma once -#include "CHandlingData.hpp" -#include "CVehicleDrawHandler.hpp" -#include "CVehicleModelInfo.hpp" +#include "vehicle/CHandlingData.hpp" +#include "vehicle/CVehicleDrawHandler.hpp" +#include "vehicle/CVehicleModelInfo.hpp" -#include "fwEntity.hpp" +#include "rage/fwEntity.hpp" #include diff --git a/CHandlingData.hpp b/vehicle/CHandlingData.hpp similarity index 99% rename from CHandlingData.hpp rename to vehicle/CHandlingData.hpp index 6712211..50bb7da 100644 --- a/CHandlingData.hpp +++ b/vehicle/CHandlingData.hpp @@ -1,6 +1,6 @@ #pragma once -#include "vector.hpp" +#include "rage/vector.hpp" #include diff --git a/CVehicleDrawHandler.hpp b/vehicle/CVehicleDrawHandler.hpp similarity index 100% rename from CVehicleDrawHandler.hpp rename to vehicle/CVehicleDrawHandler.hpp diff --git a/CVehicleModelInfo.hpp b/vehicle/CVehicleModelInfo.hpp similarity index 98% rename from CVehicleModelInfo.hpp rename to vehicle/CVehicleModelInfo.hpp index b3197c3..3a7b5dc 100644 --- a/CVehicleModelInfo.hpp +++ b/vehicle/CVehicleModelInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "CBaseModelInfo.hpp" +#include "base/CBaseModelInfo.hpp" #include diff --git a/CAmmoInfo.hpp b/weapon/CAmmoInfo.hpp similarity index 95% rename from CAmmoInfo.hpp rename to weapon/CAmmoInfo.hpp index cf24be2..2fa7e71 100644 --- a/CAmmoInfo.hpp +++ b/weapon/CAmmoInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "CItemInfo.hpp" +#include "weapon/CItemInfo.hpp" #include diff --git a/CItemInfo.hpp b/weapon/CItemInfo.hpp similarity index 100% rename from CItemInfo.hpp rename to weapon/CItemInfo.hpp diff --git a/CWeaponInfo.hpp b/weapon/CWeaponInfo.hpp similarity index 99% rename from CWeaponInfo.hpp rename to weapon/CWeaponInfo.hpp index e7c76c6..6b0a099 100644 --- a/CWeaponInfo.hpp +++ b/weapon/CWeaponInfo.hpp @@ -1,7 +1,7 @@ #pragma once -#include "CAmmoInfo.hpp" -#include "CItemInfo.hpp" +#include "weapon/CAmmoInfo.hpp" +#include "weapon/CItemInfo.hpp" #include