remove m_bIsTransparent
This commit is contained in:
@@ -15,7 +15,6 @@
|
|||||||
Screen::Screen( CString sName )
|
Screen::Screen( CString sName )
|
||||||
{
|
{
|
||||||
SetName( sName );
|
SetName( sName );
|
||||||
m_bIsTransparent = false;
|
|
||||||
|
|
||||||
ALLOW_OPERATOR_MENU_BUTTON.Load( sName, "AllowOperatorMenuButton" );
|
ALLOW_OPERATOR_MENU_BUTTON.Load( sName, "AllowOperatorMenuButton" );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,6 @@ public:
|
|||||||
void ClearMessageQueue();
|
void ClearMessageQueue();
|
||||||
void ClearMessageQueue( const ScreenMessage SM ); // clear of a specific SM
|
void ClearMessageQueue( const ScreenMessage SM ); // clear of a specific SM
|
||||||
|
|
||||||
bool IsTransparent() const { return m_bIsTransparent; }
|
|
||||||
virtual bool UsesBackground() const { return true; } // override and set false if this screen shouldn't load a background
|
virtual bool UsesBackground() const { return true; } // override and set false if this screen shouldn't load a background
|
||||||
virtual ScreenType GetScreenType() const { return ALLOW_OPERATOR_MENU_BUTTON ? game_menu : system_menu; }
|
virtual ScreenType GetScreenType() const { return ALLOW_OPERATOR_MENU_BUTTON ? game_menu : system_menu; }
|
||||||
|
|
||||||
@@ -71,8 +70,6 @@ protected:
|
|||||||
vector<QueuedScreenMessage> m_QueuedMessages;
|
vector<QueuedScreenMessage> m_QueuedMessages;
|
||||||
static bool SortMessagesByDelayRemaining(const QueuedScreenMessage &m1, const QueuedScreenMessage &m2);
|
static bool SortMessagesByDelayRemaining(const QueuedScreenMessage &m1, const QueuedScreenMessage &m2);
|
||||||
|
|
||||||
bool m_bIsTransparent; // screens below us need to be drawn first
|
|
||||||
|
|
||||||
ThemeMetric<bool> ALLOW_OPERATOR_MENU_BUTTON;
|
ThemeMetric<bool> ALLOW_OPERATOR_MENU_BUTTON;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -41,8 +41,6 @@ void ScreenMiniMenu::Init( const MenuDef* pDef, ScreenMessage SM_SendOnOK, Scree
|
|||||||
|
|
||||||
this->SortByDrawOrder();
|
this->SortByDrawOrder();
|
||||||
|
|
||||||
m_bIsTransparent = true; // draw screens below us
|
|
||||||
|
|
||||||
m_SMSendOnOK = SM_SendOnOK;
|
m_SMSendOnOK = SM_SendOnOK;
|
||||||
m_SMSendOnCancel = SM_SendOnCancel;
|
m_SMSendOnCancel = SM_SendOnCancel;
|
||||||
m_vMenuRows = pDef->rows;
|
m_vMenuRows = pDef->rows;
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const CString &sText, Prom
|
|||||||
ScreenPrompt::ScreenPrompt( const CString &sScreenName ):
|
ScreenPrompt::ScreenPrompt( const CString &sScreenName ):
|
||||||
ScreenWithMenuElements( sScreenName )
|
ScreenWithMenuElements( sScreenName )
|
||||||
{
|
{
|
||||||
m_bIsTransparent = true; // draw screens below us
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenPrompt::Init()
|
void ScreenPrompt::Init()
|
||||||
|
|||||||
@@ -86,8 +86,6 @@ ScreenTextEntry::ScreenTextEntry(
|
|||||||
bool bPassword ) :
|
bool bPassword ) :
|
||||||
ScreenWithMenuElements( sClassName )
|
ScreenWithMenuElements( sClassName )
|
||||||
{
|
{
|
||||||
m_bIsTransparent = true; // draw screens below us
|
|
||||||
|
|
||||||
m_sQuestion = sQuestion;
|
m_sQuestion = sQuestion;
|
||||||
m_sAnswer = CStringToWstring( sInitialAnswer );
|
m_sAnswer = CStringToWstring( sInitialAnswer );
|
||||||
m_iMaxInputLength = iMaxInputLength;
|
m_iMaxInputLength = iMaxInputLength;
|
||||||
|
|||||||
Reference in New Issue
Block a user