Skip to content

Commit

Permalink
maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
@shad0wshayd3 @github-actions
shad0wshayd3 authored and github-actions[bot] committed Aug 3, 2023
1 parent 40c0fa8 commit 0ed7afe
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/BSGraphics.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "RE/Bethesda/BSTHashMap.h"
#include "RE/NetImmerse/NiRect.h"
#include "RE/NetImmerse/NiTexture.h"
#include "RE/NetImmerse/NiSmartPointer.h"
#include "RE/NetImmerse/NiTexture.h"

struct ID3D11Buffer;
struct ID3D11ComputeShader;
Expand Down
4 changes: 2 additions & 2 deletions CommonLibF4/include/RE/Bethesda/BSModelDB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace RE
BSResource::RHandleType<BSResource::Entry<NiPointer<NiNode>, BSResource::EntryDBTraits<BSModelDB::DBTraits, BSResource::EntryDB<BSModelDB::DBTraits>>::CArgs>, BSResource::EntryDB<BSModelDB::DBTraits>>& a_result,
const DBTraits::ArgsType& a_args)
{
using func_t = BSResource::ErrorCode (*)(const char*,BSResource::RHandleType<BSResource::Entry<NiPointer<NiNode>, BSResource::EntryDBTraits<BSModelDB::DBTraits, BSResource::EntryDB<BSModelDB::DBTraits>>::CArgs>, BSResource::EntryDB<BSModelDB::DBTraits>>&,const DBTraits::ArgsType&);
using func_t = BSResource::ErrorCode (*)(const char*, BSResource::RHandleType<BSResource::Entry<NiPointer<NiNode>, BSResource::EntryDBTraits<BSModelDB::DBTraits, BSResource::EntryDB<BSModelDB::DBTraits>>::CArgs>, BSResource::EntryDB<BSModelDB::DBTraits>>&, const DBTraits::ArgsType&);
REL::Relocation<func_t> func{ REL::ID(1066398) };
return func(a_name, a_result, a_args);
}
Expand All @@ -67,7 +67,7 @@ namespace RE
NiPointer<NiNode>* a_result,
const DBTraits::ArgsType& a_args)
{
using func_t = BSResource::ErrorCode (*)(const char*,NiPointer<NiNode>*,const DBTraits::ArgsType&);
using func_t = BSResource::ErrorCode (*)(const char*, NiPointer<NiNode>*, const DBTraits::ArgsType&);
REL::Relocation<func_t> func{ REL::ID(1225688) };
return func(a_name, a_result, a_args);
}
Expand Down
30 changes: 15 additions & 15 deletions CommonLibF4/include/RE/Bethesda/BSResource/Entry.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "RE/Bethesda/Atomic.h"
#include "RE/Bethesda/BSFixedString.h"
#include "RE/Bethesda/BSLock.h"
#include "RE/Bethesda/BSTSmartPointer.h"
#include "RE/Bethesda/BSTSingleton.h"
#include "RE/Bethesda/BSTSmartPointer.h"

namespace RE
{
Expand All @@ -13,7 +13,7 @@ namespace RE
class Location;
class Stream;

template<class T>
template <class T>
class EntryDB;

struct DAP
Expand Down Expand Up @@ -167,7 +167,7 @@ namespace RE
std::uint32_t misses; // 20
};

template<class T_Entry, class T_EntryDB>
template <class T_Entry, class T_EntryDB>
class RHandleType
{
public:
Expand Down Expand Up @@ -223,22 +223,22 @@ namespace RE
using U_RHandleType = T_RHandleType;

// members
StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest* table[T_SIZE * 2]; // 00
// BSTLocklessQueue::ObjMultiProdCons<StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest, T_SIZE, 0> queue; // ??
StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest* table[T_SIZE * 2]; // 00
// BSTLocklessQueue::ObjMultiProdCons<StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest, T_SIZE, 0> queue; // ??
std::byte pad10000[0x70400 - 0x10000];
typename T_RHandleType::U_Entry::U_EntryDBTraitsCArgs cargs[T_SIZE]; // ??
BSNonReentrantSpinLock schedProtect; // ??
typename T_RHandleType::U_Entry::U_EntryDBTraitsCArgs cargs[T_SIZE]; // ??
BSNonReentrantSpinLock schedProtect; // ??
std::byte pad88404[0x88440 - 0x88404];
BSResource::StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest rescheduleSearchRequest; // ??
BSTAtomicValue<std::uint32_t> IDGen; // ??
StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest* root; // ??
StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest* lowest; // ??
StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest* tombstone; // ??
std::uint32_t tableActive; // ??
BSResource::StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest rescheduleSearchRequest; // ??
BSTAtomicValue<std::uint32_t> IDGen; // ??
StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest* root; // ??
StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest* lowest; // ??
StreamerTraits<T_RHandleType, T_SIZE>::StreamRequest* tombstone; // ??
std::uint32_t tableActive; // ??
std::byte pad884A4[0x88500 - 0x884A4];
};

template<class T_EntryDBTraits>
template <class T_EntryDBTraits>
class EntryDBBase :
public EntryDBBaseUtil,
public T_EntryDBTraits::U_DBTraits
Expand All @@ -250,7 +250,7 @@ namespace RE
EntryBucketQueue<Entry<typename T_EntryDBTraits::U_DBTraits::U_Type, typename T_EntryDBTraits::CArgs>, 512> releaseQueue; // ??
};

template<class T_DBTraits>
template <class T_DBTraits>
class EntryDB :
public IEntryDB,
public EntryDBBase<EntryDBTraits<T_DBTraits, BSResource::EntryDB<T_DBTraits>>>,
Expand Down
8 changes: 4 additions & 4 deletions CommonLibF4/include/RE/Bethesda/IMenu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,14 +615,14 @@ namespace RE

void CreateAndSetFiltersToColor(const NiColor& a_color, float a_brightness)
{
using func_t = void(BSGFxShaderFXTarget::*)(const NiColor&, float);
using func_t = void (BSGFxShaderFXTarget::*)(const NiColor&, float);
REL::Relocation<func_t> func{ REL::ID(1487925) };
func(this, a_color, a_brightness);
}

void CreateAndSetFiltersToColor(std::uint8_t a_r, std::uint8_t a_g, std::uint8_t a_b, float a_brightness)
{
using func_t = void(BSGFxShaderFXTarget::*)(std::uint8_t, std::uint8_t, std::uint8_t, float);
using func_t = void (BSGFxShaderFXTarget::*)(std::uint8_t, std::uint8_t, std::uint8_t, float);
REL::Relocation<func_t> func{ REL::ID(783104) };
func(this, a_r, a_g, a_b, a_brightness);
}
Expand Down Expand Up @@ -2104,7 +2104,7 @@ namespace RE
static_assert(sizeof(TerminalMenu) == 0x268);

class __declspec(novtable) TerminalMenuButtons :
public GameMenuBase // 00
public GameMenuBase // 00
{
public:
static constexpr auto RTTI{ RTTI::TerminalMenuButtons };
Expand Down Expand Up @@ -2146,7 +2146,7 @@ namespace RE
virtual void OnThumbstickEvent(const ThumbstickEvent* a_event) override; // 04

// override (BSTEventSink)
virtual BSEventNotifyControl ProcessEvent(const MenuOpenCloseEvent& a_event, BSTEventSource<MenuOpenCloseEvent>* a_source) override;//01
virtual BSEventNotifyControl ProcessEvent(const MenuOpenCloseEvent& a_event, BSTEventSource<MenuOpenCloseEvent>* a_source) override; //01

// members
BSTArray<BSSoundHandle> registeredSounds; // 0E8
Expand Down
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/ImageSpaceModifier.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace RE
};
static_assert(sizeof(ImageSpaceModifierInstance) == 0x28);

class ImageSpaceModifierInstanceForm :
class ImageSpaceModifierInstanceForm :
public ImageSpaceModifierInstance
{
public:
Expand Down
3 changes: 1 addition & 2 deletions CommonLibF4/src/RE/NetImmerse/NiAVObject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ namespace RE
void NiAVObject::Update(NiUpdateData& a_data)
{
UpdateDownwardPass(a_data, 0);
if (parent && ((a_data.flags & 0x200) == 0))
{
if (parent && ((a_data.flags & 0x200) == 0)) {
parent->UpdateUpwardPass(a_data);
}
}
Expand Down

0 comments on commit 0ed7afe

Please sign in to comment.