diff --git a/CommonLibSF/include/RE/A/AIProcess.h b/CommonLibSF/include/RE/A/AIProcess.h index 0e7e2f99..edaab507 100644 --- a/CommonLibSF/include/RE/A/AIProcess.h +++ b/CommonLibSF/include/RE/A/AIProcess.h @@ -41,4 +41,4 @@ namespace RE std::uint64_t unkF0; // F0 }; static_assert(sizeof(AIProcess) == 0xF8); -} +} // namespace RE diff --git a/CommonLibSF/include/RE/A/Actor.h b/CommonLibSF/include/RE/A/Actor.h index 83b74630..761bbc66 100644 --- a/CommonLibSF/include/RE/A/Actor.h +++ b/CommonLibSF/include/RE/A/Actor.h @@ -1,8 +1,8 @@ #pragma once -#include "RE/T/TESObjectREFR.h" #include "RE/A/AIProcess.h" #include "RE/A/ActorPackage.h" +#include "RE/T/TESObjectREFR.h" namespace RE { @@ -148,142 +148,142 @@ namespace RE virtual void Unk_1A0(); // 1A0 virtual void Unk_1A1(); // 1A1 - std::uint64_t unk110; // 110 - std::uint64_t unk118; // 118 - std::uint64_t unk120; // 120 - std::uint64_t unk128; // 128 - std::uint64_t unk130; // 130 - std::uint64_t unk138; // 138 - std::uint64_t unk140; // 140 - std::uint64_t unk148; // 148 - std::uint64_t unk150; // 150 - std::uint64_t unk158; // 158 - std::uint64_t unk160; // 160 - std::uint64_t unk168; // 168 - std::uint64_t unk170; // 170 - std::uint64_t unk178; // 178 - std::uint64_t unk180; // 180 - std::uint64_t unk188; // 188 - std::uint64_t unk190; // 190 - std::uint64_t unk198; // 198 - std::uint64_t unk1A0; // 1A0 - std::uint64_t unk1A8; // 1A8 - std::uint64_t unk1B0; // 1B0 - std::uint64_t unk1B8; // 1B8 - std::uint64_t unk1C0; // 1C0 - std::uint64_t unk1C8; // 1C8 - std::uint64_t unk1D0; // 1D0 - std::uint64_t unk1D8; // 1D8 - std::uint64_t unk1E0; // 1E0 - std::uint64_t unk1E8; // 1E8 - std::uint64_t unk1F0; // 1F0 - std::uint64_t unk1F8; // 1F8 - std::uint64_t unk200; // 200 - std::uint64_t unk208; // 208 - std::uint64_t unk210; // 210 - std::uint64_t unk218; // 218 - std::uint64_t unk220; // 220 - std::uint64_t unk228; // 228 - std::uint64_t unk230; // 230 - std::uint64_t unk238; // 238 - std::uint64_t unk240; // 240 - std::uint64_t unk248; // 248 - std::uint64_t unk250; // 250 - std::uint64_t unk258; // 258 - AIProcess* currentProcess; // 260 - std::uint64_t unk268; // 268 - std::uint64_t unk270; // 270 - std::uint64_t unk278; // 278 - std::uint64_t unk280; // 280 - std::uint64_t unk288; // 288 - std::uint64_t unk290; // 290 - std::uint64_t unk298; // 298 - std::uint64_t unk2A0; // 2A0 - std::uint64_t unk2A8; // 2A8 - std::uint64_t unk2B0; // 2B0 - std::uint64_t unk2B8; // 2B8 - std::uint64_t unk2C0; // 2C0 - std::uint64_t unk2C8; // 2C8 - std::uint64_t unk2D0; // 2D0 - std::uint64_t unk2D8; // 2D8 - std::uint64_t unk2E0; // 2E0 - std::uint64_t unk2E8; // 2E8 - std::uint64_t unk2F0; // 2F0 - std::uint64_t unk2F8; // 2F8 - std::uint64_t unk300; // 300 - std::uint64_t unk308; // 308 - std::uint64_t unk310; // 310 - std::uint64_t unk318; // 318 - std::uint64_t unk320; // 320 - std::uint64_t unk328; // 328 - std::uint64_t unk330; // 330 - std::uint64_t unk338; // 338 - std::uint64_t unk340; // 340 - std::uint64_t unk348; // 348 - std::uint64_t unk350; // 350 - std::uint64_t unk358; // 358 - std::uint64_t unk360; // 360 - std::uint64_t unk368; // 368 - std::uint64_t unk370; // 370 - std::uint64_t unk378; // 378 - std::uint64_t unk380; // 380 - std::uint64_t unk388; // 388 - std::uint64_t unk390; // 390 - std::uint64_t unk398; // 398 - std::uint64_t unk3A0; // 3A0 - std::uint64_t unk3A8; // 3A8 - std::uint64_t unk3B0; // 3B0 - std::uint64_t unk3B8; // 3B8 - std::uint64_t unk3C0; // 3C0 - std::uint64_t unk3C8; // 3C8 - std::uint64_t unk3D0; // 3D0 - std::uint64_t unk3D8; // 3D8 - std::uint64_t unk3E0; // 3E0 - std::uint64_t unk3E8; // 3E8 - std::uint64_t unk3F0; // 3F0 - std::uint64_t unk3F8; // 3F8 - std::uint64_t unk400; // 400 - std::uint64_t unk408; // 408 - std::uint64_t unk410; // 410 - std::uint64_t unk418; // 418 - std::uint64_t unk420; // 420 - std::uint64_t unk428; // 428 - std::uint64_t unk430; // 430 - std::uint64_t unk438; // 438 - std::uint64_t unk440; // 440 - std::uint64_t unk448; // 448 - std::uint64_t unk450; // 450 - std::uint64_t unk458; // 458 - std::uint64_t unk460; // 460 - std::uint64_t unk468; // 468 - std::uint64_t unk470; // 470 - std::uint64_t unk478; // 478 - std::uint64_t unk480; // 480 - std::uint64_t unk488; // 488 - std::uint64_t unk490; // 490 - std::uint64_t unk498; // 498 - std::uint64_t unk4A0; // 4A0 - std::uint64_t unk4A8; // 4A8 - std::uint64_t unk4B0; // 4B0 - std::uint64_t unk4B8; // 4B8 - std::uint64_t unk4C0; // 4C0 - std::uint64_t unk4C8; // 4C8 - std::uint64_t unk4D0; // 4D0 - std::uint64_t unk4D8; // 4D8 - std::uint64_t unk4E0; // 4E0 - std::uint64_t unk4E8; // 4E8 - std::uint64_t unk4F0; // 4F0 - std::uint64_t unk4F8; // 4F8 - std::uint64_t unk500; // 500 - std::uint64_t unk508; // 508 - std::uint64_t unk510; // 510 - std::uint64_t unk518; // 518 - std::uint64_t unk520; // 520 - std::uint64_t unk528; // 528 - std::uint64_t unk530; // 530 - std::uint64_t unk538; // 538 - std::uint64_t unk540; // 540 - std::uint64_t unk548; // 548 + std::uint64_t unk110; // 110 + std::uint64_t unk118; // 118 + std::uint64_t unk120; // 120 + std::uint64_t unk128; // 128 + std::uint64_t unk130; // 130 + std::uint64_t unk138; // 138 + std::uint64_t unk140; // 140 + std::uint64_t unk148; // 148 + std::uint64_t unk150; // 150 + std::uint64_t unk158; // 158 + std::uint64_t unk160; // 160 + std::uint64_t unk168; // 168 + std::uint64_t unk170; // 170 + std::uint64_t unk178; // 178 + std::uint64_t unk180; // 180 + std::uint64_t unk188; // 188 + std::uint64_t unk190; // 190 + std::uint64_t unk198; // 198 + std::uint64_t unk1A0; // 1A0 + std::uint64_t unk1A8; // 1A8 + std::uint64_t unk1B0; // 1B0 + std::uint64_t unk1B8; // 1B8 + std::uint64_t unk1C0; // 1C0 + std::uint64_t unk1C8; // 1C8 + std::uint64_t unk1D0; // 1D0 + std::uint64_t unk1D8; // 1D8 + std::uint64_t unk1E0; // 1E0 + std::uint64_t unk1E8; // 1E8 + std::uint64_t unk1F0; // 1F0 + std::uint64_t unk1F8; // 1F8 + std::uint64_t unk200; // 200 + std::uint64_t unk208; // 208 + std::uint64_t unk210; // 210 + std::uint64_t unk218; // 218 + std::uint64_t unk220; // 220 + std::uint64_t unk228; // 228 + std::uint64_t unk230; // 230 + std::uint64_t unk238; // 238 + std::uint64_t unk240; // 240 + std::uint64_t unk248; // 248 + std::uint64_t unk250; // 250 + std::uint64_t unk258; // 258 + AIProcess* currentProcess; // 260 + std::uint64_t unk268; // 268 + std::uint64_t unk270; // 270 + std::uint64_t unk278; // 278 + std::uint64_t unk280; // 280 + std::uint64_t unk288; // 288 + std::uint64_t unk290; // 290 + std::uint64_t unk298; // 298 + std::uint64_t unk2A0; // 2A0 + std::uint64_t unk2A8; // 2A8 + std::uint64_t unk2B0; // 2B0 + std::uint64_t unk2B8; // 2B8 + std::uint64_t unk2C0; // 2C0 + std::uint64_t unk2C8; // 2C8 + std::uint64_t unk2D0; // 2D0 + std::uint64_t unk2D8; // 2D8 + std::uint64_t unk2E0; // 2E0 + std::uint64_t unk2E8; // 2E8 + std::uint64_t unk2F0; // 2F0 + std::uint64_t unk2F8; // 2F8 + std::uint64_t unk300; // 300 + std::uint64_t unk308; // 308 + std::uint64_t unk310; // 310 + std::uint64_t unk318; // 318 + std::uint64_t unk320; // 320 + std::uint64_t unk328; // 328 + std::uint64_t unk330; // 330 + std::uint64_t unk338; // 338 + std::uint64_t unk340; // 340 + std::uint64_t unk348; // 348 + std::uint64_t unk350; // 350 + std::uint64_t unk358; // 358 + std::uint64_t unk360; // 360 + std::uint64_t unk368; // 368 + std::uint64_t unk370; // 370 + std::uint64_t unk378; // 378 + std::uint64_t unk380; // 380 + std::uint64_t unk388; // 388 + std::uint64_t unk390; // 390 + std::uint64_t unk398; // 398 + std::uint64_t unk3A0; // 3A0 + std::uint64_t unk3A8; // 3A8 + std::uint64_t unk3B0; // 3B0 + std::uint64_t unk3B8; // 3B8 + std::uint64_t unk3C0; // 3C0 + std::uint64_t unk3C8; // 3C8 + std::uint64_t unk3D0; // 3D0 + std::uint64_t unk3D8; // 3D8 + std::uint64_t unk3E0; // 3E0 + std::uint64_t unk3E8; // 3E8 + std::uint64_t unk3F0; // 3F0 + std::uint64_t unk3F8; // 3F8 + std::uint64_t unk400; // 400 + std::uint64_t unk408; // 408 + std::uint64_t unk410; // 410 + std::uint64_t unk418; // 418 + std::uint64_t unk420; // 420 + std::uint64_t unk428; // 428 + std::uint64_t unk430; // 430 + std::uint64_t unk438; // 438 + std::uint64_t unk440; // 440 + std::uint64_t unk448; // 448 + std::uint64_t unk450; // 450 + std::uint64_t unk458; // 458 + std::uint64_t unk460; // 460 + std::uint64_t unk468; // 468 + std::uint64_t unk470; // 470 + std::uint64_t unk478; // 478 + std::uint64_t unk480; // 480 + std::uint64_t unk488; // 488 + std::uint64_t unk490; // 490 + std::uint64_t unk498; // 498 + std::uint64_t unk4A0; // 4A0 + std::uint64_t unk4A8; // 4A8 + std::uint64_t unk4B0; // 4B0 + std::uint64_t unk4B8; // 4B8 + std::uint64_t unk4C0; // 4C0 + std::uint64_t unk4C8; // 4C8 + std::uint64_t unk4D0; // 4D0 + std::uint64_t unk4D8; // 4D8 + std::uint64_t unk4E0; // 4E0 + std::uint64_t unk4E8; // 4E8 + std::uint64_t unk4F0; // 4F0 + std::uint64_t unk4F8; // 4F8 + std::uint64_t unk500; // 500 + std::uint64_t unk508; // 508 + std::uint64_t unk510; // 510 + std::uint64_t unk518; // 518 + std::uint64_t unk520; // 520 + std::uint64_t unk528; // 528 + std::uint64_t unk530; // 530 + std::uint64_t unk538; // 538 + std::uint64_t unk540; // 540 + std::uint64_t unk548; // 548 }; static_assert(sizeof(Actor) == 0x550); } // namespace RE diff --git a/CommonLibSF/include/RE/A/ActorPackage.h b/CommonLibSF/include/RE/A/ActorPackage.h index 2e96f2f0..c7665f79 100644 --- a/CommonLibSF/include/RE/A/ActorPackage.h +++ b/CommonLibSF/include/RE/A/ActorPackage.h @@ -21,5 +21,4 @@ namespace RE std::int8_t preferredSpeed; // 2B }; static_assert(sizeof(ActorPackage) == 0x30); -} - +} // namespace RE diff --git a/CommonLibSF/include/RE/Starfield.h b/CommonLibSF/include/RE/Starfield.h index 6e28d3ad..1864e004 100644 --- a/CommonLibSF/include/RE/Starfield.h +++ b/CommonLibSF/include/RE/Starfield.h @@ -2,12 +2,12 @@ #include "SFSE/Impl/PCH.h" +#include "RE/A/AIProcess.h" #include "RE/A/Actor.h" #include "RE/A/ActorPackage.h" #include "RE/A/ActorValueInfo.h" #include "RE/A/ActorValueOwner.h" #include "RE/A/ActorValues.h" -#include "RE/A/AIProcess.h" #include "RE/B/BGSAttackDataForm.h" #include "RE/B/BGSDestructibleObjectForm.h" #include "RE/B/BGSEditorID.h" diff --git a/CommonLibSF/vcpkg.json b/CommonLibSF/vcpkg.json index 0da74dc4..980ad28b 100644 --- a/CommonLibSF/vcpkg.json +++ b/CommonLibSF/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "commonlibsf", - "version-date": "2023-09-29.1", + "version-date": "2023-09-29.2", "port-version": 0, "description": "A collaborative reverse-engineered library for Starfield.", "homepage": "https://github.com/Starfield-Reverse-Engineering/CommonLibSF", diff --git a/README.md b/README.md index 40706d38..b271b3af 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![C++23](https://img.shields.io/static/v1?label=standard&message=c%2B%2B23&color=blue&logo=c%2B%2B&&logoColor=red&style=flat)](https://en.cppreference.com/w/cpp/compiler_support) ![Platform](https://img.shields.io/static/v1?label=platform&message=windows&color=dimgray&style=flat&logo=windows) [![Game version](https://img.shields.io/badge/game%20version-1.7.29-orange)](#Developing-with-CommonLibSF) -[![VCPKG_VER](https://img.shields.io/static/v1?label=vcpkg%20registry&message=2023-09-29.1&color=green&style=flat)](https://github.com/Starfield-Reverse-Engineering/Starfield-RE-vcpkg) +[![VCPKG_VER](https://img.shields.io/static/v1?label=vcpkg%20registry&message=2023-09-29.2&color=green&style=flat)](https://github.com/Starfield-Reverse-Engineering/Starfield-RE-vcpkg) [![Main CI](https://img.shields.io/github/actions/workflow/status/Starfield-Reverse-Engineering/CommonLibSF/main_ci.yml)](https://github.com/Starfield-Reverse-Engineering/CommonLibSF/actions/workflows/main_ci.yml) ## Build Dependencies