Skip to content

Commit c455548

Browse files
FlenarnDevFlenarnTemp
FlenarnDev
and
FlenarnTemp
authored
misc. additions (#34)
* feat: DialogueUtils namespace declared and partially implemented. * feat: Update several IDs. * maintenance * Update BSScript_Internal_LinkerProcessor.h * maintenance * feat: Populate `etTreeType` enum. * feat: Declare `TextureUpdateDone`. feat: Declare `TextureUpdateStage`. feat: Declare `TextureUpdateStart`. * maintenance * feat: Populate `NiMemStream`::OpenMode` enum. * feat: Declare `PACK_EVENT_ACTION_TYPE`. * feat: Populate `TESGrass::GRASS_WATER_STATE` enum. * chore: Swap local stub declaration to import. * feat: Populate `IMovementState::CHARACTER_STATE` enum. * chore: Update more IDs to NG. * feat: 3 enum classes declared. * fix: Corrent namespace of `DialogueUtils` to `DialogueMenuUtils.`. feat: Declare `TESTopicInfo::StartSceneOnEnd` function. * maintenance * fix: Compiles again, me bad. * feat: A few more functions. * maintenance * feat: Declare `REFR_LIGHT`. feat: Declare `ExtraLight`. * maintenance * feat: Populate `PlayerCharacter::GrabbingType` enum. * feat: Misc. enums populated, some minor classes declared. * maintenance --------- Co-authored-by: FlenarnTemp <FlenarnTemp@users.noreply.github.com> Co-authored-by: FlenarnDev <FlenarnDev@users.noreply.github.com>
1 parent ff6e1e8 commit c455548

28 files changed

Lines changed: 406 additions & 45 deletions

‎include/RE/B/BGSArtObject.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@ namespace RE
1616
static constexpr auto VTABLE{ VTABLE::BGSArtObject };
1717
static constexpr auto FORM_ID{ ENUM_FORM_ID::kARTO };
1818

19-
enum class ArtType;
19+
enum class ArtType
20+
{
21+
kMagicCastingArt = 0x0,
22+
kMagicHitEffect = 0x1,
23+
kMagicEnchantEffect = 0x2,
24+
25+
kTotal = 0x3
26+
};
2027

2128
class Data
2229
{

‎include/RE/B/BGSCameraShot.h‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,25 @@ namespace RE
1717
static constexpr auto VTABLE{ VTABLE::BGSCameraShot };
1818
static constexpr auto FORM_ID{ ENUM_FORM_ID::kCAMS };
1919

20-
enum class CAM_ACTION;
21-
enum class CAM_OBJECT;
20+
enum class CAM_ACTION
21+
{
22+
kShoot = 0x0,
23+
kFly = 0x1,
24+
kHit = 0x2,
25+
kZoom = 0x3,
26+
27+
kTotal = 0x4
28+
};
29+
30+
enum class CAM_OBJECT
31+
{
32+
kAttacker = 0x0,
33+
kProjectile = 0x1,
34+
kTarget = 0x2,
35+
kLeadActor = 0x3,
36+
37+
kTotal = 0x4
38+
};
2239

2340
class CAMERA_SHOT_DATA
2441
{

‎include/RE/B/BSScript_Internal_LinkerProcessor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace RE
3838
ErrorLogger* errorLogger; // 10
3939
ILoader* loader; // 18
4040
std::uint64_t unk20; // 20
41-
char* unk28; // 28
41+
bool forceReload; // 28
4242
BSScrapArray<BSFixedString> loadedParents; // 30
4343
BSScrapArray<BSFixedString> objectsToTypecheck; // 50
4444
BSScrapArray<BSFixedString> processQueue; // 70

‎include/RE/D/DialogueMenuUtils.h‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
namespace DialogueMenuUtils
6+
{
7+
inline void OpenMenu()
8+
{
9+
using func_t = decltype(&DialogueMenuUtils::OpenMenu);
10+
static REL::Relocation<func_t> func{ ID::DialogueMenuUtils::OpenMenu };
11+
return func();
12+
}
13+
14+
inline void CloseMenu()
15+
{
16+
using func_t = decltype(&DialogueMenuUtils::CloseMenu);
17+
static REL::Relocation<func_t> func{ ID::DialogueMenuUtils::CloseMenu };
18+
return func();
19+
}
20+
21+
inline void ShowSpeechChallengeAnim()
22+
{
23+
using func_t = decltype(&DialogueMenuUtils::ShowSpeechChallengeAnim);
24+
static REL::Relocation<func_t> func{ ID::DialogueMenuUtils::ShowSpeechChallengeAnim };
25+
return func();
26+
}
27+
}
28+
}

‎include/RE/D/_D3DBLEND.h‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class _D3DBLEND
6+
{
7+
kZero = 0x1,
8+
kOne = 0x2,
9+
kSrcColor = 0x3,
10+
kInvSrcColor = 0x4,
11+
kSrcAlpha = 0x5,
12+
kInvSrcAlpha = 0x6,
13+
kDestAlpha = 0x7,
14+
kInvDestAlpha = 0x8,
15+
kDestColor = 0x9,
16+
kInvDestColor = 0xA,
17+
kSrcAlphaSat = 0xB,
18+
kBothSrcAlpha = 0xC,
19+
kBothInvSrcAlpha = 0xD,
20+
kBlendFactor = 0xE,
21+
kInvBlendFactor = 0xF,
22+
kSrcColor2 = 0x10,
23+
kInvSrcColor2 = 0x11,
24+
kForce_DWORD = 0x7FFFFFFF
25+
};
26+
}

‎include/RE/D/_D3DBLENDOP.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class _D3DBLENDOP
6+
{
7+
kAdd = 0x1,
8+
kSubtract = 0x2,
9+
kRevSubtract = 0x3,
10+
kMin = 0x4,
11+
kMax = 0x5,
12+
kForce_DWORD = 0x7FFFFFFF
13+
};
14+
}

‎include/RE/D/_D3DCMPFUNC.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#pragma once
2+
3+
namespace RE
4+
{
5+
enum class _D3DCMPFUNC
6+
{
7+
kNever = 0x1,
8+
kLess = 0x2,
9+
kEqual = 0x3,
10+
kLessEqual = 0x4,
11+
kGreater = 0x5,
12+
kNotEqual = 0x6,
13+
kGreaterEqual = 0x7,
14+
kAlways = 0x8,
15+
kForce_DWORD = 0x7FFFFFFF
16+
};
17+
}

‎include/RE/E/EffectShaderData.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#pragma once
22

3+
#include "RE/D/_D3DBLEND.h"
4+
#include "RE/D/_D3DBLENDOP.h"
5+
#include "RE/D/_D3DCMPFUNC.h"
6+
37
namespace RE
48
{
5-
enum class _D3DBLEND;
6-
enum class _D3DBLENDOP;
7-
enum class _D3DCMPFUNC;
8-
99
class EffectShaderData
1010
{
1111
public:

‎include/RE/E/ExtraLight.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#pragma once
2+
3+
#include "RE/B/BSExtraData.h"
4+
#include "RE/R/REFR_LIGHT.h"
5+
6+
namespace RE
7+
{
8+
class __declspec(novtable) ExtraLight :
9+
public BSExtraData // 00
10+
{
11+
public:
12+
static constexpr auto RTTI{ RTTI::ExtraLight };
13+
static constexpr auto VTABLE{ VTABLE::ExtraLight };
14+
static constexpr atuo TYPE{ EXTRA_DATA_TYPE::kLight };
15+
16+
// members
17+
REFR_LIGHT lightdata; // 18
18+
};
19+
static_assert(sizeof(ExtraLight) == 0x30);
20+
}

‎include/RE/Fallout.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,13 +523,17 @@
523523
#include "RE/D/DestructibleObjectStage.h"
524524
#include "RE/D/DeviceConnectEvent.h"
525525
#include "RE/D/DialogueMenu.h"
526+
#include "RE/D/DialogueMenuUtils.h"
526527
#include "RE/D/DialoguePackage.h"
527528
#include "RE/D/DifficultyLevel.h"
528529
#include "RE/D/DisableHeavyItemsFunc.h"
529530
#include "RE/D/DisconnectHandler.h"
530531
#include "RE/D/DisplayItemModel.h"
531532
#include "RE/D/DoBeforeNewOrLoadCompletedEvent.h"
532533
#include "RE/D/DoorTeleportData.h"
534+
#include "RE/D/_D3DBLEND.h"
535+
#include "RE/D/_D3DBLENDOP.h"
536+
#include "RE/D/_D3DCMPFUNC.h"
533537
#include "RE/E/EDGE_EXTRA_INFO_TYPE.h"
534538
#include "RE/E/ENCOUNTER_ZONE_DATA.h"
535539
#include "RE/E/ENCOUNTER_ZONE_GAME_DATA.h"
@@ -562,6 +566,7 @@
562566
#include "RE/E/ExtraHealth.h"
563567
#include "RE/E/ExtraInstanceData.h"
564568
#include "RE/E/ExtraLeveledCreature.h"
569+
#include "RE/E/ExtraLight.h"
565570
#include "RE/E/ExtraLocation.h"
566571
#include "RE/E/ExtraLock.h"
567572
#include "RE/E/ExtraMapMarker.h"
@@ -828,6 +833,7 @@
828833
#include "RE/O/OtherInputEvents.h"
829834
#include "RE/P/PACKAGE_DATA.h"
830835
#include "RE/P/PACKAGE_OBJECT_TYPE.h"
836+
#include "RE/P/PACK_EVENT_ACTION_TYPE.h"
831837
#include "RE/P/PACK_SCHED_DATA.h"
832838
#include "RE/P/PART_DATA.h"
833839
#include "RE/P/PATH_DATA.h"
@@ -921,6 +927,7 @@
921927
#include "RE/R/RACE_DATA.h"
922928
#include "RE/R/RACE_SIZE.h"
923929
#include "RE/R/RANK_DATA.h"
930+
#include "RE/R/REFR_LIGHT.h"
924931
#include "RE/R/REFR_LOCK.h"
925932
#include "RE/R/RESET_3D_FLAGS.h"
926933
#include "RE/R/ReadyWeaponHandler.h"
@@ -1104,6 +1111,9 @@
11041111
#include "RE/T/TerminalHolotapeMenu.h"
11051112
#include "RE/T/TerminalMenu.h"
11061113
#include "RE/T/TerminalMenuButtons.h"
1114+
#include "RE/T/TextureUpdateDone.h"
1115+
#include "RE/T/TextureUpdateStage.h"
1116+
#include "RE/T/TextureUpdateStart.h"
11071117
#include "RE/T/ThirdPersonState.h"
11081118
#include "RE/T/ThumbstickEvent.h"
11091119
#include "RE/T/TravelMarkerStateChange.h"

0 commit comments

Comments
 (0)