Update StarTitleScreen.cpp
This commit is contained in:
parent
93839a2032
commit
ea21eb55d7
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
namespace Star {
|
namespace Star {
|
||||||
|
|
||||||
TitleScreen::TitleScreen(PlayerStoragePtr playerStorage, MixerPtr mixer)
|
TitleScreen::TitleScreen(PlayerStoragePtr playerStorage, MixerPtr mixer, UniverseClientPtr client)
|
||||||
: m_playerStorage(playerStorage), m_skipMultiPlayerConnection(false), m_mixer(mixer) {
|
: m_playerStorage(playerStorage), m_skipMultiPlayerConnection(false), m_mixer(mixer) {
|
||||||
m_titleState = TitleState::Quit;
|
m_titleState = TitleState::Quit;
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ TitleScreen::TitleScreen(PlayerStoragePtr playerStorage, MixerPtr mixer)
|
|||||||
initCharSelectionMenu();
|
initCharSelectionMenu();
|
||||||
initCharCreationMenu();
|
initCharCreationMenu();
|
||||||
initMultiPlayerMenu();
|
initMultiPlayerMenu();
|
||||||
initOptionsMenu();
|
initOptionsMenu(client);
|
||||||
initModsMenu();
|
initModsMenu();
|
||||||
|
|
||||||
resetState();
|
resetState();
|
||||||
@ -345,8 +345,8 @@ void TitleScreen::initMultiPlayerMenu() {
|
|||||||
m_paneManager.registerPane("multiplayerMenu", PaneLayer::Hud, m_multiPlayerMenu);
|
m_paneManager.registerPane("multiplayerMenu", PaneLayer::Hud, m_multiPlayerMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TitleScreen::initOptionsMenu() {
|
void TitleScreen::initOptionsMenu(UniverseClientPtr client) {
|
||||||
auto optionsMenu = make_shared<OptionsMenu>(&m_paneManager);
|
auto optionsMenu = make_shared<OptionsMenu>(&m_paneManager,client);
|
||||||
optionsMenu->setAnchor(PaneAnchor::Center);
|
optionsMenu->setAnchor(PaneAnchor::Center);
|
||||||
optionsMenu->lockPosition();
|
optionsMenu->lockPosition();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user