Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

oopsies #17

Merged
merged 3 commits into from
Jul 30, 2024
Merged

oopsies #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3b370b
chore: Cleanup enum declaration.
FlenarnTemp Jul 30, 2024
dbcf7d5
fix: Class override incorrect.
FlenarnTemp Jul 30, 2024
8672136
oopsies
FlenarnTemp Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions CommonLibF4/include/RE/Bethesda/Actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,37 +111,37 @@ namespace RE

enum class ACTOR_CRITICAL_STAGE : std::int32_t
{
kNone = 0,
kGooStart = 1,
kGooEnd = 2,
kDisintegrateStart = 3,
kDisintegrateEnd = 4,
kFreezeStart = 5,
kFreezeEnd = 6,
kCount = 7
kNone,
kGooStart,
kGooEnd,
kDisintegrateStart,
kDisintegrateEnd,
kFreezeStart,
kFreezeEnd,
kCount
};

enum class ACTOR_LIFE_STATE : std::int32_t
{
kAlive = 0,
kDying = 1,
kDead = 2,
kUnconscious = 3,
kReanimate = 4,
kRecycle = 5,
kRestrained = 6,
kEssentialDown = 7,
kBleedout = 8
kAlive,
kDying,
kDead,
kUnconscious,
kReanimate,
kRecycle,
kRestrained,
kEssentialDown,
kBleedout
};

enum class ACTOR_LOS_LOCATION : std::int32_t
{
kNone = 0,
kEye = 1,
kHead = 2,
kTorse = 3,
kFeet = 4,
kCount = 5
kNone,
kEye,
kHead,
kTorse,
kFeet,
kCount
};

enum class PTYPE : std::int32_t
Expand Down
2 changes: 2 additions & 0 deletions CommonLibF4/include/RE/Bethesda/Events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include "RE/Bethesda/Actor.h"
#include "RE/Bethesda/BSFixedString.h"
#include "RE/Bethesda/BSPointerHandle.h"
#include "RE/Bethesda/BSTArray.h"
Expand All @@ -12,6 +13,7 @@

namespace RE
{
class ActiveEffect;
class bhkNPCollisionObject;
class BGSMessage;
class HUDModeType;
Expand Down
1 change: 1 addition & 0 deletions CommonLibF4/include/RE/Bethesda/PipboyDataManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "RE/Bethesda/PipboyQuestData.h"
#include "RE/Bethesda/PipboyRadioData.h"
#include "RE/Bethesda/PipboySpecialData.h"
#include "RE/Bethesda/PipboyStatsData.h"
#include "RE/Bethesda/PipboyThrottleManager.h"
#include "RE/Bethesda/PipboyValue.h"
#include "RE/Bethesda/PipboyWorkshopData.h"
Expand Down
2 changes: 1 addition & 1 deletion CommonLibF4/include/RE/Bethesda/PipboyStatsData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace RE
virtual BSEventNotifyControl ProcessEvent(const PlayerActiveEffectChanged::Event& a_event, BSTEventSource<PlayerActiveEffectChanged::Event>* a_source); // 03
virtual BSEventNotifyControl ProcessEvent(const ConditionBoyEvent& a_event, BSTEventSource<ConditionBoyEvent>* a_source); // 04
virtual BSEventNotifyControl ProcessEvent(const ActorItemEquipped::Event& a_event, BSTEventSource<ActorItemEquipped::Event>* a_source); // 05
virtual BSEventNotifyControl ProcessEvent(const BGSInventoryListEvent::Event& a_event, BSTEventSource<BGSInventoryListEvent::Event>* a_source); // 06
virtual BSEventNotifyControl ProcessEvent(const BGSInventoryItemEvent::Event& a_event, BSTEventSource<BGSInventoryItemEvent::Event>* a_source); // 06

// override
virtual void Populate(bool a_arg1) override; // 07
Expand Down
20 changes: 10 additions & 10 deletions CommonLibF4/include/RE/Bethesda/VATS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@ namespace RE
class TESHitEvent;
struct WeaponFiredEvent;

namespace VATSEvents
{
struct ModeChange
{
VATS::VATS_MODE_ENUM oldMode; // 00
VATS::VATS_MODE_ENUM newMode; // 04
};
static_assert(sizeof(ModeChange) == 0x8);
}

class __declspec(novtable) VATS :
public BSTEventSink<WeaponFiredEvent>, // 00
public BSTEventSink<ProjectileBeginUpdateEvent>, // 08
Expand Down Expand Up @@ -92,4 +82,14 @@ namespace RE
BSSpinLock spinLock; // D0
};
static_assert(sizeof(VATS) == 0xD8);

namespace VATSEvents
{
struct ModeChange
{
VATS::VATS_MODE_ENUM oldMode; // 00
VATS::VATS_MODE_ENUM newMode; // 04
};
static_assert(sizeof(ModeChange) == 0x8);
}
}