Skip to content

Commit 47b2408

Browse files
committed
chore: Misc. cleanup.
1 parent 0b2f49b commit 47b2408

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

Plugin/src/Events/LevelIncreaseEvent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace RE
1111
{
1212
virtual BSEventNotifyControl ProcessEvent(const LevelIncrease::Event& a_event, BSTEventSource<LevelIncrease::Event>*) override
1313
{
14-
LevelUpMenu::HandleLevelup();
14+
LevelUpMenu::HandleLevelUp();
1515
return BSEventNotifyControl::kContinue;
1616
}
1717
};

Plugin/src/Events/MenuOpenCloseEvent.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ namespace RE
2525
}
2626
}
2727

28-
if (a_event.menuName == BSFixedString("CASLevelUpMenu"))
29-
{
30-
UI::GetSingleton()->RegisterMenu("CASLevelUpMenu", LevelUpMenu::CASLevelUpMenu::CreateCASLevelUpMenu);
31-
}
32-
3328
return BSEventNotifyControl::kContinue;
3429
}
3530
};

Plugin/src/Systems/Dialogue.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ namespace RE
652652
}
653653
}
654654

655-
// Expanded logic for 'Enabled' value, needs to take inot account possible values from both Shared and 'local' info.
655+
// Expanded logic for 'Enabled' value, needs to take into account possible values from both Shared and 'local' info.
656656
bool enabled = false;
657657
if (dataInfo)
658658
{
@@ -675,7 +675,7 @@ namespace RE
675675
// No NPC response info - look one phase ahead (only) for a NPC response action.
676676
if (BGSSceneActionNPCResponseDialogue* npcResponseAction = FindNextNPCResponseAction(currentScene, currentScene->currentActivePhase))
677677
{
678-
// Another framework check...
678+
// Another framework check normally goes here...
679679
npcResponseInfo = GetNPCResponseInfo(npcResponseAction, infoEntry.optionID);
680680
}
681681
}
@@ -778,6 +778,7 @@ namespace RE
778778
{
779779
// Restore player dialogue starting.
780780
uint8_t bytes[] = { 0x48, 0x8B, 0xC8 };
781+
781782
// StartPlayerDialogue - 2196817 + 652 offset.
782783
REL::Relocation<std::uintptr_t> startPlayerDialogue{ REL::ID(2196817), 0x652 };
783784
REL::safe_write<uint8_t>(startPlayerDialogue.address(), std::span{ bytes });

Plugin/src/main.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ DLLEXPORT bool F4SEAPI F4SEPlugin_Load(const F4SE::LoadInterface* a_F4SE)
180180
return false;
181181
}
182182

183-
if (!scaleform->Register("Cascadia-LevelUpMenu", RE::Cascadia::LevelUpMenu::RegisterScaleform))
183+
184+
RE::Cascadia::LevelUpMenu::RegisterMenu();
185+
if (!scaleform->Register("CASLevelUpMenu", RE::Cascadia::LevelUpMenu::RegisterScaleform))
184186
{
185187
FATAL("Failed to register 'LevelUpMenu', marking as incompatible."sv);
186188
return false;

0 commit comments

Comments
 (0)