From 7ee9724deeed3d692a4a9d292836e78f350b68e2 Mon Sep 17 00:00:00 2001 From: AconiteGodOfSWG Date: Sun, 22 Nov 2020 11:00:04 -0500 Subject: [PATCH] "enter space" atmo flight btn default not visible on launch into space --- .../src/shared/page/SwgCuiHudSpace.cpp | 9 +++++++-- .../src/shared/page/SwgCuiHudSpace.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.cpp b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.cpp index 0005c9870..dba28c8e7 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.cpp +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.cpp @@ -69,7 +69,8 @@ SwgCuiHudSpace::SwgCuiHudSpace(UIPage & page) : m_missileLockOnYouPage(NULL), m_missileLockTimer(c_blinkDecaySeconds), m_missileLockWidget(NULL), - m_missileLockEffector(NULL) + m_missileLockEffector(NULL), + m_enterSpaceButton(NULL) { m_targetingEnabled = false; @@ -124,6 +125,11 @@ SwgCuiHudSpace::SwgCuiHudSpace(UIPage & page) : getCodeDataObject(TUIButton, m_tutorialButton, "trainerButton"); m_tutorialButton->SetVisible(false); + + // by default keep the atmospheric flight "enterSpaceButton" off when launching into space + // this can be adjusted to toggle specifically for atmospheric flight later + getCodeDataObject(TUIButton, m_enterSpaceButton, "buttonEnterSpace"); + m_enterSpaceButton->SetVisible(false); m_buttonParentPage = NON_NULL(static_cast(m_exitStationButton->GetParent(TUIPage))); //lint !e1774 // Could dynamic cast. m_buttonParentPage->SetVisible(true); @@ -356,7 +362,6 @@ void SwgCuiHudSpace::update(float const updateDeltaSeconds) if (s_drawHudSpaceStateDrivenWidgets) { ShipObject const * const playerShip = Game::getPlayerPilotedShip(); - if (playerShip) { CreateMissileMessage createMissileMessage(0, playerShip->getNetworkId(), playerShip->getNetworkId(), Vector::zero, playerShip->getPosition_w(), 0, 0, 0, 0); diff --git a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.h b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.h index de163c36c..6c5637d62 100644 --- a/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.h +++ b/src/game/client/library/swgClientUserInterface/src/shared/page/SwgCuiHudSpace.h @@ -69,6 +69,7 @@ private: UIButton * m_ejectButton; UIButton * m_exitStationButton; UIButton * m_tutorialButton; + UIButton * m_enterSpaceButton; UIPage * m_buttonParentPage; UIPage * m_missileLockOnYouPage; Timer m_missileLockTimer;