Rebase branch to main

This commit is contained in:
Hyper 2025-01-17 20:44:56 +00:00
parent 110f341af6
commit 4b358d8e43
4 changed files with 5 additions and 21 deletions

View file

@ -1,4 +1,5 @@
#include <api/SWA.h> #include <api/SWA.h>
#include <ui/reddog/debug_draw.h>
#include <ui/game_window.h> #include <ui/game_window.h>
#include <user/achievement_data.h> #include <user/achievement_data.h>
#include <user/config.h> #include <user/config.h>
@ -106,22 +107,3 @@ PPC_FUNC(sub_82586698)
__imp__sub_82586698(ctx, base); __imp__sub_82586698(ctx, base);
} }
PPC_FUNC_IMPL(__imp__sub_822C9398);
PPC_FUNC(sub_822C9398)
{
auto a2 = (Hedgehog::Math::CVector*)g_memory.Translate(ctx.r4.u32);
auto a3 = (Hedgehog::Math::CVector*)g_memory.Translate(ctx.r5.u32);
auto a4 = (be<unsigned int>*)g_memory.Translate(ctx.r6.u32);
Reddog::Vector3 start(a2->X, a2->Y, a2->Z);
Reddog::Vector3 end(a3->X, a3->Y, a3->Z);
const Reddog::SDrawLine line{
start, end, a4->value
};
Reddog::DebugDraw::DrawLine(line);
__imp__sub_822C9398(ctx, base);
}

View file

@ -10,6 +10,8 @@ void ExportsWindow::Draw()
{ {
ImGui::TextColored({ 1, 0, 0, 1 }, "For testing purposes only, use Hedge Mod Manager to toggle these."); ImGui::TextColored({ 1, 0, 0, 1 }, "For testing purposes only, use Hedge Mod Manager to toggle these.");
Reddog::Checkbox("Allow Cancelling Unleash", &Config::AllowCancellingUnleash.Value); Reddog::Checkbox("Allow Cancelling Unleash", &Config::AllowCancellingUnleash.Value);
Reddog::Checkbox("Disable Auto Save Warning", &Config::DisableAutoSaveWarning.Value);
Reddog::Checkbox("Disable DLC Icon", &Config::DisableDLCIcon.Value);
Reddog::Checkbox("Fix Unleash Out of Control Drain", &Config::FixUnleashOutOfControlDrain.Value); Reddog::Checkbox("Fix Unleash Out of Control Drain", &Config::FixUnleashOutOfControlDrain.Value);
Reddog::Checkbox("Homing Attack on Boost", &Config::HomingAttackOnBoost.Value); Reddog::Checkbox("Homing Attack on Boost", &Config::HomingAttackOnBoost.Value);
Reddog::Checkbox("Save Score at Checkpoints", &Config::SaveScoreAtCheckpoints.Value); Reddog::Checkbox("Save Score at Checkpoints", &Config::SaveScoreAtCheckpoints.Value);

@ -1 +1 @@
Subproject commit 775f0bb0262101653b68f5a2e42305e3a30c3347 Subproject commit 263812fd188ab4b318337ef1317418432b85bc16

@ -1 +1 @@
Subproject commit de2840970ffc3161a4cb8743b10ddd4da93bdc9f Subproject commit 7fb8af1bad9ecb22d5fa9c1b72555cdf7c22db02