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.

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

Fix invalid menu name in rumble testing #905

Merged
merged 2 commits into from
Dec 31, 2024

Conversation

lightmanLP
Copy link
Contributor

@lightmanLP lightmanLP commented Dec 24, 2024

std::dynamic_pointer_cast<BenInputEditorWindow>(Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Input Editor"));

Input Editor -> LUS::InputEditorWindow
2S2H Input Editor -> BenInputEditorWindow

Build Artifacts

@Archez Archez changed the base branch from develop to develop-satoko December 25, 2024 01:08
@Archez Archez changed the base branch from develop-satoko to develop December 25, 2024 01:08
@Archez
Copy link
Contributor

Archez commented Dec 25, 2024

As a fix, I think this would be better rebased and pointed to the develop-Satoko branch.

@lightmanLP lightmanLP changed the base branch from develop to develop-satoko December 25, 2024 01:26
Comment on lines 1639 to 1640
controllerConfigWindow = std::dynamic_pointer_cast<BenInputEditorWindow>(
Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Input Editor"));
Ship::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("2S2H Input Editor"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@briaguya-ai I just noticed the code that uses this window fetch is commented out (for bailing out of rumble if the input editor was actively testing rumble). SoH does not have this commented out.

If it is not needed at all then I think this code can just be removed all together. Especially considering that rumble could be tested on a port that isn't port 1.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i was quite confused as to how this got to be this way. it looks like it was commented out back when we were using the upstream LUS input editor window 782c51c which doesn't have rumble testing support.

since the 2ship input editor is based off the ship input editor, we should be able to uncomment that part

@Archez Archez merged commit 082d11a into HarbourMasters:develop-satoko Dec 31, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants