diff --git a/gtav.rcnet b/gtav.rcnet index c845d92..45d7e98 100644 Binary files a/gtav.rcnet and b/gtav.rcnet differ diff --git a/ui/CBlip.hpp b/ui/CBlip.hpp new file mode 100644 index 0000000..4422c31 --- /dev/null +++ b/ui/CBlip.hpp @@ -0,0 +1,39 @@ +#pragma once + +namespace rage +{ +#pragma pack(push, 1) + class CBlip + { + public: + int32_t m_id; //0x0000 + int16_t m_blip_array_index; //0x0004 + int16_t m_some_reference_number_one; //0x0006 + int8_t m_some_reference_number_two; //0x0008 + char pad_0009[1]; //0x0009 + bool m_has_other_values; //0x000A + char pad_000B[1]; //0x000B + int32_t m_entity_pool_index; //0x000C + rage::fvector3 m_position; //0x0010 + char pad_001C[4]; //0x001C + uint32_t m_display_bits; //0x0020 + uint32_t m_trigger_bits; //0x0024 + char* m_message; //0x0028 + char pad_0030[16]; //0x0030 + int32_t m_icon; //0x0040 + uint16_t m_flash_interval; //0x0044 + uint16_t m_flash_duration; //0x0046 + uint32_t m_color; //0x0048 + uint32_t m_secondary_color; //0x004C + rage::fvector2 m_scale; //0x0050 + float m_rotation; //0x0058 + char pad_005C[5]; //0x005C + uint8_t m_priority; //0x0061 + char pad_0062[1]; //0x0062 + uint8_t m_alpha; //0x0063 + uint8_t m_category; //0x0064 + int8_t m_number_to_show; //0x0065 + }; //Size: 0x0066 +#pragma pack(pop) + static_assert(sizeof(CBlip) == 0x66, "CBlip is not sized properly."); +} \ No newline at end of file diff --git a/ui/CBlipEntry.hpp b/ui/CBlipEntry.hpp index b0fe605..7bc5d38 100644 --- a/ui/CBlipEntry.hpp +++ b/ui/CBlipEntry.hpp @@ -1,10 +1,10 @@ #pragma once -#include "blip_t.hpp" +#include "CBlip.hpp" class CBlipEntry { public: - rage::Blip_t* m_pBlip; //0x0000 + rage::CBlip* m_pBlip; //0x0000 };//Size=0x0008 \ No newline at end of file diff --git a/ui/blip_t.hpp b/ui/blip_t.hpp deleted file mode 100644 index 785ed78..0000000 --- a/ui/blip_t.hpp +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -namespace rage -{ - class Blip_t - { - public: - int32_t m_id; //0x0000 - uint16_t m_blip_array_index; //0x0004 - char pad_0006[4]; //0x0006 - bool m_active; //0x000A - uint8_t N00000197; //0x000B - int32_t m_entity_id; //0x000C - float m_x; //0x0010 - float m_y; //0x0014 - float m_z; //0x0018 - char pad_001C[4]; //0x001C - uint32_t m_display_bits; //0x0020 - uint32_t m_render_bits; //0x0024 - char* m_message; //0x0028 - char pad_0030[8]; //0x0030 - Hash m_description; //0x0038 - char pad_003C[4]; //0x003C - int32_t m_icon; //0x0040 - int16_t m_flash_interval; //0x0044 - int16_t m_flash_timer; //0x0046 - uint32_t m_color; //0x0048 - uint32_t m_secondary_color; //0x004C - float m_scale_x; //0x0050 - float m_scale_y; //0x0054 - float m_rotation; //0x0058 - uint8_t m_mission_bits; //0x005C - uint8_t m_priority; //0x005D - uint8_t m_display_id; //0x005E - uint8_t m_alpha; //0x005F - int8_t m_category; //0x0060 - int8_t m_show_number; //0x0061 - char pad_0062[14]; //0x0062 - }; //Size: 0x0070 - static_assert(sizeof(Blip_t) == 0x70, "Blip_t is not sized properly."); -} \ No newline at end of file