nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Move menu to Network tab, clean up switch

Browse Source
This commit is contained in:
aMannus
2025-05-18 20:42:55 +02:00
parent e7ab37c6cc
commit 68f73d86f5
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
soh/soh/Network/Archipelago/Archipelago.cpp
View File

@@ -186,7 +186,7 @@ const std::vector<ArchipelagoClient::ApItem>& ArchipelagoClient::get_scouted_ite
const char* ArchipelagoClient::get_connection_status() { const char* ArchipelagoClient::get_connection_status() {
if (!apclient) { if (!apclient) {
return "No status available"; return "";
} }
APClient::State clientStatus = apclient->get_state(); APClient::State clientStatus = apclient->get_state();
@@ -194,25 +194,20 @@ const char* ArchipelagoClient::get_connection_status() {
switch (clientStatus) { switch (clientStatus) {
case APClient::State::DISCONNECTED: { case APClient::State::DISCONNECTED: {
return "Disconnected!"; return "Disconnected!";
break;
} }
case APClient::State::SOCKET_CONNECTING: { case APClient::State::SOCKET_CONNECTING: {
return "Socket Connecting!"; return "Socket Connecting!";
break;
} }
case APClient::State::SOCKET_CONNECTED: { case APClient::State::SOCKET_CONNECTED: {
return "Socket Connected!"; return "Socket Connected!";
break;
} }
case APClient::State::ROOM_INFO: { case APClient::State::ROOM_INFO: {
return "Room info Recieved!"; return "Room info Recieved!";
break;
} }
case APClient::State::SLOT_CONNECTED: { case APClient::State::SLOT_CONNECTED: {
return "Slot Connected!"; return "Slot Connected!";
break;
} }
default: default:
return "Unknown Status"; return "";
} }
} }

11
soh/soh/SohGui/SohMenuNetwork.cpp
View File

@@ -15,8 +15,17 @@ void SohMenu::AddMenuNetwork() {
// Add Network Menu // Add Network Menu
AddMenuEntry("Network", CVAR_SETTING("Menu.NetworkSidebarSection")); AddMenuEntry("Network", CVAR_SETTING("Menu.NetworkSidebarSection"));
// Archipelago
WidgetPath path = { "Network", "Archipelago", SECTION_COLUMN_1 };
AddSidebarEntry("Network", path.sidebarName, 1);
AddWidget(path, "Popout Archipelago Settings Window", WIDGET_WINDOW_BUTTON)
.CVar(CVAR_WINDOW("ArchipelagoSettings"))
.RaceDisable(false)
.WindowName("Archipelago Settings")
.Options(WindowButtonOptions().Tooltip("Enables the Archipelago Settings Window."));
// Sail // Sail
WidgetPath path = { "Network", "Sail", SECTION_COLUMN_1 }; path.sidebarName = "Sail";
AddSidebarEntry("Network", path.sidebarName, 3); AddSidebarEntry("Network", path.sidebarName, 3);
AddWidget(path, AddWidget(path,

9
soh/soh/SohGui/SohMenuRandomizer.cpp
View File

@@ -100,15 +100,6 @@ void SohMenu::AddMenuRandomizer() {
.WindowName("Plandomizer Editor") .WindowName("Plandomizer Editor")
.Options(WindowButtonOptions().Tooltip("Enables the separate Randomizer Settings Window.")); .Options(WindowButtonOptions().Tooltip("Enables the separate Randomizer Settings Window."));
// Archipelago
path.sidebarName = "Archipelago";
AddSidebarEntry("Randomizer", path.sidebarName, 1);
AddWidget(path, "Popout Archipelago Settings Window", WIDGET_WINDOW_BUTTON)
.CVar(CVAR_WINDOW("ArchipelagoSettings"))
.RaceDisable(false)
.WindowName("Archipelago Settings")
.Options(WindowButtonOptions().Tooltip("Enables the Archipelago Settings Window."));
// Item Tracker // Item Tracker
path.sidebarName = "Item Tracker"; path.sidebarName = "Item Tracker";
AddSidebarEntry("Randomizer", path.sidebarName, 1); AddSidebarEntry("Randomizer", path.sidebarName, 1);