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

Add initial Sail implementation #790

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

garrettjoecox
Copy link
Contributor

@garrettjoecox garrettjoecox commented Oct 2, 2024

Summary of differences from the implementation in SoH

  • Renamed to "Network" instead of "Remote"
  • Separated from GI, no real reason these needed to be bound
  • Using inheritance for the SDL_Net usage, which cleaned up some code and will allow us to have multiple networking features enabled at once (Sail, Anchor, Crowd Control)
  • Moved menu drawing to within the Sail class
  • Did not port over the GameInteractionEffect stuff, I think that needs some more cooking.

Build Artifacts

@garrettjoecox garrettjoecox force-pushed the add-initial-sail-implementation branch 2 times, most recently from d774bbf to 9c13f54 Compare October 3, 2024 03:25
mm/CMakeLists.txt Outdated Show resolved Hide resolved
mm/2s2h/Network/Sail.cpp Outdated Show resolved Hide resolved
mm/2s2h/BenGui/SearchableMenuItems.h Outdated Show resolved Hide resolved
@garrettjoecox garrettjoecox force-pushed the add-initial-sail-implementation branch 2 times, most recently from 796eda0 to 59735b4 Compare October 5, 2024 19:34
@garrettjoecox garrettjoecox force-pushed the add-initial-sail-implementation branch from 59735b4 to 6b984bf Compare November 8, 2024 04:04
@garrettjoecox garrettjoecox mentioned this pull request Nov 10, 2024
11 tasks
@garrettjoecox garrettjoecox force-pushed the add-initial-sail-implementation branch from 6b984bf to ee47074 Compare November 23, 2024 04:17
Comment on lines +357 to +365
{ DISABLE_FOR_SAIL_FORM_INVALID,
{ [](disabledInfo& info) -> bool {
return !(!isStringEmpty(CVarGetString("gNetwork.Sail.Host", "127.0.0.1")) &&
CVarGetInteger("gNetwork.Sail.Port", 43384) > 1024 &&
CVarGetInteger("gNetwork.Sail.Port", 43384) < 65535);
},
"Invalid Host/Port" } },
{ DISABLE_FOR_SAIL_ENABLED,
{ [](disabledInfo& info) -> bool { return Sail::Instance->isEnabled; }, "Sail is Enabled" } },
Copy link
Contributor

Choose a reason for hiding this comment

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

This use of Sail:: needs to be wrapped in an ifdef to prevent compile errors with networking off. Not sure if it makes sense to just ifdef out the two disable options all together, or just force the return value to false.

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.

2 participants