ModdingRX/Temp-Classes
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/GTAV-Classes-1.git synced 2026-10-10 11:53:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(script): update globals (#6)
Build / build (ubuntu-latest) (push) Failing after 47s
Details
Build / build (windows-latest) (push) Has been cancelled
Details

Browse Source 
b3586
This commit is contained in:
Mr-X-GTA
2025-09-07 15:11:20 +02:00
committed by GitHub
parent 9bfce60350
commit 8084649b34
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/globals/GPBD_FM.hpp
+4 -8
View File
@@ -517,7 +517,6 @@ struct PROPERTY_DATA
SCR_ARRAY<FACTORY_INFO, 7> FactoryInfos; SCR_ARRAY<FACTORY_INFO, 7> FactoryInfos;
SCR_INT TotalBunkerResearch; SCR_INT TotalBunkerResearch;
SCR_INT CurrentBunkerResearchProgress; SCR_INT CurrentBunkerResearchProgress;
SCR_INT BunkerDecorVariation;
SCR_INT MOCBitset; SCR_INT MOCBitset;
SCR_INT MOCColor; // bitset for some reason SCR_INT MOCColor; // bitset for some reason
uint64_t PAD_0290[2]; // unused uint64_t PAD_0290[2]; // unused
@@ -526,7 +525,7 @@ struct PROPERTY_DATA
SCR_INT PAD_0299; SCR_INT PAD_0299;
DEFUNCT_BASE_DATA DefunctBaseData; DEFUNCT_BASE_DATA DefunctBaseData;
SCR_INT AvengerInteriorDecorFlags; // "PACKED_MP_INT_ARMORY_AIRCRAFT_INTERIOR_v0" SCR_INT AvengerInteriorDecorFlags; // "PACKED_MP_INT_ARMORY_AIRCRAFT_INTERIOR_v0"
uint64_t PAD_0308[3]; uint64_t PAD_0308[2];
BUSINESS_HUB_DATA BusinessHubData; BUSINESS_HUB_DATA BusinessHubData;
NIGHTCLUB_DATA NightclubData; NIGHTCLUB_DATA NightclubData;
SCR_INT PAD_0365; SCR_INT PAD_0365;
@@ -570,7 +569,7 @@ struct PROPERTY_DATA
HACKER_DEN_DATA HackerDenData; HACKER_DEN_DATA HackerDenData;
FIELD_HANGAR_DATA FieldHangarData; FIELD_HANGAR_DATA FieldHangarData;
}; };
static_assert(sizeof(PROPERTY_DATA) == 544 * 8); static_assert(sizeof(PROPERTY_DATA) == 542 * 8);
struct BIKER_CONTRACTS struct BIKER_CONTRACTS
{ {
@@ -628,7 +627,6 @@ struct GPBD_FM_Entry
SCR_INT TutorialBitset2; SCR_INT TutorialBitset2;
TEXT_LABEL_23 PlayingContentUsedId; TEXT_LABEL_23 PlayingContentUsedId;
TEXT_LABEL_23 MatchId; TEXT_LABEL_23 MatchId;
uint64_t PAD_0156[8]; // unused
TEXT_LABEL_63 DisplayJobName; // as shown in the playerlist? TEXT_LABEL_63 DisplayJobName; // as shown in the playerlist?
STRIKE_TEAM StrikeTeam; STRIKE_TEAM StrikeTeam;
uint64_t PAD_0185[7]; // pad uint64_t PAD_0185[7]; // pad
@@ -676,14 +674,12 @@ struct GPBD_FM_Entry
uint64_t PAD_844; uint64_t PAD_844;
SCR_INT SeatingIndex; SCR_INT SeatingIndex;
ARENA_WAR_DATA ArenaWarData; // @858 as of 1.67 ARENA_WAR_DATA ArenaWarData; // @858 as of 1.67
uint64_t PAD_0861[2];
SCR_INT ApartmentEnterFlags; SCR_INT ApartmentEnterFlags;
SCR_VEC3 AvengerMissionStartPosition;
}; };
static_assert(sizeof(GPBD_FM_Entry) == 889 * 8); static_assert(sizeof(GPBD_FM_Entry) == 874 * 8);
struct GPBD_FM struct GPBD_FM
{ {
SCR_ARRAY<GPBD_FM_Entry, 32> Entries; SCR_ARRAY<GPBD_FM_Entry, 32> Entries;
}; };
static_assert(sizeof(GPBD_FM) == 28449 * 8); static_assert(sizeof(GPBD_FM) == 27969 * 8);
script/globals/GSBD.hpp
+3 -2
View File
@@ -41,8 +41,9 @@ struct SMPL_INTERIOR_DATA_SERVER
SCR_ARRAY<uint64_t, 32> PlayerInteriorSimpleInteriorTypes; SCR_ARRAY<uint64_t, 32> PlayerInteriorSimpleInteriorTypes;
SCR_ARRAY<uint64_t, 32> PlayerInteriorIsOwnerless; SCR_ARRAY<uint64_t, 32> PlayerInteriorIsOwnerless;
SCR_ARRAY<uint64_t, 32> PlayerInteriorOwners; SCR_ARRAY<uint64_t, 32> PlayerInteriorOwners;
SCR_INT TimeUpdated;
}; };
static_assert(sizeof(SMPL_INTERIOR_DATA_SERVER) == 234 * 8); static_assert(sizeof(SMPL_INTERIOR_DATA_SERVER) == 235 * 8);
struct LEAVE_CLUBHOUSE_SERVER struct LEAVE_CLUBHOUSE_SERVER
{ {
@@ -91,4 +92,4 @@ struct GSBD
uint64_t PAD_1399[97]; uint64_t PAD_1399[97];
SCR_INT CayoPericoStrandedAnimalChoice; SCR_INT CayoPericoStrandedAnimalChoice;
}; };
static_assert(sizeof(GSBD) == 1498 * 8); static_assert(sizeof(GSBD) == 1499 * 8);
script/globals/GSBD_FM.hpp
+2 -1
View File
@@ -63,5 +63,6 @@ struct GSBD_FM
WEAPON_PICKUPS WeaponPickups; WEAPON_PICKUPS WeaponPickups;
BIKER_CONTRACTS_SERVER BikerContracts; BIKER_CONTRACTS_SERVER BikerContracts;
SCR_ARRAY<uint64_t, 32> DoubleActionCacheLocationRevealed; SCR_ARRAY<uint64_t, 32> DoubleActionCacheLocationRevealed;
SCR_INT TimeUpdated;
}; };
static_assert(sizeof(GSBD_FM) == 647 * 8); static_assert(sizeof(GSBD_FM) == 649 * 8);
script/globals/g_AMC_playerBD.hpp
+2 -2
View File
@@ -7,10 +7,10 @@ struct g_AMC_playerBD_Entry
SCR_ARRAY<TIMER, NUM_CONTACTS> UsedContactServicesTimer; // only index 2 (mugger) is actually used by the scripts. the rest is just a waste of bandwidth SCR_ARRAY<TIMER, NUM_CONTACTS> UsedContactServicesTimer; // only index 2 (mugger) is actually used by the scripts. the rest is just a waste of bandwidth
SCR_ARRAY<uint64_t, NUM_CONTACTS> ContactServiceCooldowns; // same as above SCR_ARRAY<uint64_t, NUM_CONTACTS> ContactServiceCooldowns; // same as above
}; };
static_assert(sizeof(g_AMC_playerBD_Entry) == 248 * 8); static_assert(sizeof(g_AMC_playerBD_Entry) == 251 * 8);
struct g_AMC_playerBD struct g_AMC_playerBD
{ {
SCR_ARRAY<g_AMC_playerBD_Entry, 32> Entries; SCR_ARRAY<g_AMC_playerBD_Entry, 32> Entries;
}; };
static_assert(sizeof(g_AMC_playerBD) == 7937 * 8); static_assert(sizeof(g_AMC_playerBD) == 8033 * 8);
script/types.hpp
+1 -1
View File
@@ -100,4 +100,4 @@ private:
}; };
static_assert(sizeof(GAMER_HANDLE) == 13 * 8); static_assert(sizeof(GAMER_HANDLE) == 13 * 8);
#define NUM_CONTACTS 82 #define NUM_CONTACTS 83