mirror/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp synced 2026-06-09 20:51:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed village camera receiving input in options menu, replaced extra nav inputs in achievements menu with fast scroll (#344)

Browse Source 
* options_menu: prohibit right stick input to prevent camera moving in villages

* achievement_menu: remove extra nav inputs, implemented fast scroll

* achievement_menu: replicate skills menu fast scrolling
This commit is contained in:
Hyper
2025-02-09 21:18:59 +00:00
committed by GitHub
parent 0b8b243404
commit fc99db7c97
5 changed files with 88 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnleashedRecomp/ui/options_menu.cpp
+33 -18
View File
@@ -18,6 +18,7 @@
#include <app.h>
#include <decompressor.h>
#include <exports.h>
#include <sdl_listener.h>
#include <res/images/options_menu/miles_electric.dds.h>
@@ -101,6 +102,24 @@ static double g_appearTime = 0.0;
static std::unique_ptr<GuestTexture> g_upMilesElectric;
static float g_rightStickY;
class SDLEventListenerForOptionsMenu : public SDLEventListener
{
public:
bool OnSDLEvent(SDL_Event* event) override
{
if (!OptionsMenu::s_isVisible || !hid::IsInputAllowed())
return false;
if (event->type == SDL_CONTROLLERAXISMOTION && event->caxis.axis == SDL_CONTROLLER_AXIS_RIGHTY)
g_rightStickY = event->caxis.value / 32767.0f;
return false;
}
}
g_sdlEventListenerForOptionsMenu;
static void DrawTitle()
{
static constexpr double fadeOffset = 3.0;
@@ -1476,23 +1495,19 @@ static void DrawInfoPanel(ImVec2 infoMin, ImVec2 infoMax)
if (scrollMax > 0.0f)
{
if (auto pInputState = SWA::CInputState::GetInstance())
{
auto& rPadState = pInputState->GetPadState();
auto& vert = rPadState.RightStickVertical;
auto vert = -g_rightStickY;
if (fabs(vert) > 0.25f)
{
isManualScrolling = true;
scrollOffset += vert * scrollSpeed * App::s_deltaTime;
}
else if (isManualScrolling && fabs(vert) <= 0.25f)
{
isScrolling = false;
isManualScrolling = false;
scrollTimer = 0.0f;
scrollDirection = vert > 0.0f ? 1.0f : -1.0f;
}
if (fabs(vert) > 0.25f)
{
isManualScrolling = true;
scrollOffset += vert * scrollSpeed * App::s_deltaTime;
}
else if (isManualScrolling && fabs(vert) <= 0.25f)
{
isScrolling = false;
isManualScrolling = false;
scrollTimer = 0.0f;
scrollDirection = vert > 0.0f ? 1.0f : -1.0f;
}
if (!isManualScrolling)
@@ -1750,7 +1765,7 @@ void OptionsMenu::Open(bool isPause, SWA::EMenuType pauseMenuType)
ButtonGuide::Open(buttons);
ButtonGuide::SetSideMargins(250);
hid::SetProhibitedButtons(XAMINPUT_GAMEPAD_START);
hid::SetProhibitedInputs(XAMINPUT_GAMEPAD_START, false, true);
}
void OptionsMenu::Close()
@@ -1764,7 +1779,7 @@ void OptionsMenu::Close()
ButtonGuide::Close();
Config::Save();
hid::SetProhibitedButtons(0);
hid::SetProhibitedInputs();
}
// Skip Miles Electric animation at main menu.