Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
Piglit committed Aug 30, 2024
1 parent 357958b commit 4072487
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/menus/serverCreationScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ ServerCampaignScreen::ServerCampaignScreen()
std::this_thread::sleep_for(std::chrono::milliseconds(100));
//new JoinServerScreen(ServerBrowserMenu::SearchSource::Local, sp::io::network::Address("127.0.0.1"), listenPort);
destroy();
new MissionControlScreen(getRenderLayer());
new ProxyJoinScreen();
}
else if (info.settings.empty())
{
Expand Down Expand Up @@ -665,9 +665,9 @@ ProxyJoinScreen::ProxyJoinScreen()
(new GuiOverlay(this, "", glm::u8vec4{255,255,255,255}))->setTextureTiled("gui/background/crosses.png");

auto container = new GuiElement(this, "");
container->setPosition(0,0,sp::Alignment::Center)->setSize(350+510+50+50+50, 370+50+50)->setAttribute("layout", "horizontal");
container->setPosition(0,0,sp::Alignment::Center)->setSize(510+50, 370+50+50)->setAttribute("layout", "horizontal");
auto panel = new GuiPanel(container, "");
panel->setPosition(50 ,50, sp::Alignment::TopLeft)->setSize(350, 280);
panel->setPosition(50 ,50, sp::Alignment::TopLeft)->setSize(510, 370);

// ship creation panel
auto ship_content = new GuiElement(panel, "");
Expand Down Expand Up @@ -716,8 +716,7 @@ string ProxyJoinScreen::proxySpawn(string templ, string drive)
string callsign = PreferencesManager::get("shipname", "");
string instance = PreferencesManager::get("instance_name", "");
string password = PreferencesManager::get("password", "");
string script = "getScriptStorage.players.onProxySpawn(\""
+ script + "\", \""
string script = "getScriptStorage().wh_players:onProxySpawn(\""
+ instance + "\", \""
+ callsign + "\", \""
+ templ + "\", \""
Expand Down

0 comments on commit 4072487

Please sign in to comment.